Merge branch 'release/0.5-M5'

CHANGES.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## 0.5-M5
+
+This milestone fixes the Signing and Keys view and provides it as a separate installable feature on the update site.
+
+* [484461](https://bugs.eclipse.org/bugs/show_bug.cgi?id=484461) APK signing is broken
+* [484462](https://bugs.eclipse.org/bugs/show_bug.cgi?id=484462) "Signing and Keys" view as a separate installable feature
+* [484560](https://bugs.eclipse.org/bugs/show_bug.cgi?id=484560) ADT XML Overlay uses non-standard Bundle-SymbolicName: overlay.org.eclipse.andmore.overlay
+* [484667](https://bugs.eclipse.org/bugs/show_bug.cgi?id=484667) Fix plugin and features vendor/provider name
+* [484689](https://bugs.eclipse.org/bugs/show_bug.cgi?id=484689) Feature names to comply with Android trademark
+
 ## 0.5-M4
 
 This milestone fixes a build error against the Eclipse Neon release.

andmore-core/features/basic/feature.properties

@@ -1,13 +1,13 @@
-#################################################################################
-#
-# ANDROID Feature properties
-#
-#################################################################################
+feature.label = Development Tools for Android (Incubating)
+feature.provider.name = Eclipse Andmore
 
+feature.description = \
+Development Tools for Android. \
+Contains code development tools/utilities and database support for projects.
 
-feature.android.label = Andmore Core Development Feature (Incubating)
-feature.android.provider.name = Eclipse.org
-feature.android.update.site.name = Andmore Product Updates
-
-feature.android.description = Andmore core features. Contains code development tools/utilities and database support for projects.
-feature.android.copyright = Copyright (C) 2012 The Android Open Source Project
+feature.copyright = \
+Copyright (c) 2007, 2015 Google Inc. and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html