android_development

Files

Takeshi Hagikura 11e09fc057 Deletes the wear samples that have been commited in the wrong place.

Updates the location of wear samples in sdk.atree
Adds SpeedTracker wear sample (https://googleplex-android-review.git.corp.google.com/564608)

Conflicts:
	samples/wearable/AgendaData/Application/build.gradle
	samples/wearable/AgendaData/Application/proguard-rules.txt
	samples/wearable/DataLayer/Application/build.gradle
	samples/wearable/DataLayer/Wearable/src/main/AndroidManifest.xml
	samples/wearable/DelayedConfirmation/Application/build.gradle
	samples/wearable/FindMyPhone/Application/build.gradle
	samples/wearable/FindMyPhone/Application/src/main/AndroidManifest.xml
	samples/wearable/Flashlight/Wearable/proguard-rules.txt
	samples/wearable/Geofencing/Application/build.gradle
	samples/wearable/GridViewPager/Wearable/src/main/java/com/example/android/wearable/gridviewpager/MainActivity.java
	samples/wearable/Quiz/Application/build.gradle
	samples/wearable/SynchronizedNotifications/Application/build.gradle
	samples/wearable/SynchronizedNotifications/Application/src/main/java/com/example/android/wearable/synchronizednotifications/PhoneActivity.java
	samples/wearable/SynchronizedNotifications/Wearable/build.gradle
	samples/wearable/SynchronizedNotifications/Wearable/src/main/java/com/example/android/wearable/synchronizednotifications/NotificationUpdateService.java

(cherry picked from commit 83642406f8)
Signed-off-by: Trevor Johns <trevorjohns@google.com>

Change-Id: I7107d45d9c54e7d8dc317bd562608d661a8b5284

2014-10-22 11:20:52 -07:00

tools

Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE.

2014-06-20 08:49:37 -07:00

Android.mk

Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE.

2014-06-20 08:49:37 -07:00

product_sdk.mk

Move ZipAlign to build-tools. DO NOT MERGE.

2014-04-04 10:45:35 -07:00

sdk-android-armeabi-v7a.atree

Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE.