diff options
| author | Trevor Johns <trevorjohns@google.com> | 2014-11-13 20:57:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-13 20:57:51 +0000 |
| commit | f78c6348f7a7aa556cd6805432bdd17d8197e565 (patch) | |
| tree | d9d5dbbe37e5afa6527c8b27cb3642bc1ea78cbb /build | |
| parent | 84bf28b21da413db17054f860e327d9057a53f96 (diff) | |
| parent | f83bd1f88165b73f122a769c4366083f84ff9e28 (diff) | |
am f83bd1f8: am 41478596: am c6b0eb1a: Merge "Revert "sdk.atree: Disable Wear samples for lmp branches"" into lmp-docs
* commit 'f83bd1f88165b73f122a769c4366083f84ff9e28':
Revert "sdk.atree: Disable Wear samples for lmp branches"
Diffstat (limited to 'build')
| -rw-r--r-- | build/sdk.atree | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/build/sdk.atree b/build/sdk.atree index 882f87de3..8c678a895 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -311,25 +311,24 @@ developers/build/prebuilts/gradle/RevealEffectBasic sam developers/build/prebuilts/androidtv samples/${PLATFORM_NAME}/androidtv # Wearable sample tree -# Disabled for lmp (currently built for klp-modular only) -# developers/build/prebuilts/gradle/AgendaData samples/${PLATFORM_NAME}/wearable/AgendaData -# developers/build/prebuilts/gradle/DataLayer samples/${PLATFORM_NAME}/wearable/DataLayer -# developers/build/prebuilts/gradle/DelayedConfirmation samples/${PLATFORM_NAME}/wearable/DelayedConfirmation -# developers/build/prebuilts/gradle/ElizaChat samples/${PLATFORM_NAME}/wearable/ElizaChat -# developers/build/prebuilts/gradle/EmbeddedApp samples/${PLATFORM_NAME}/wearable/EmbeddedApp -# developers/build/prebuilts/gradle/FindMyPhone samples/${PLATFORM_NAME}/wearable/FindMyPhone -# developers/build/prebuilts/gradle/Flashlight samples/${PLATFORM_NAME}/wearable/Flashlight -# developers/build/prebuilts/gradle/Geofencing samples/${PLATFORM_NAME}/wearable/Geofencing -# developers/build/prebuilts/gradle/GridViewPager samples/${PLATFORM_NAME}/wearable/GridViewPager -# developers/build/prebuilts/gradle/JumpingJack samples/${PLATFORM_NAME}/wearable/JumpingJack -# developers/build/prebuilts/gradle/Notifications samples/${PLATFORM_NAME}/wearable/Notifications -# developers/build/prebuilts/gradle/Quiz samples/${PLATFORM_NAME}/wearable/Quiz -# developers/build/prebuilts/gradle/RecipeAssistant samples/${PLATFORM_NAME}/wearable/RecipeAssistant -# developers/build/prebuilts/gradle/SkeletonWearableApp samples/${PLATFORM_NAME}/wearable/SkeletonWearableApp -# developers/build/prebuilts/gradle/SpeedTracker samples/${PLATFORM_NAME}/wearable/SpeedTracker -# developers/build/prebuilts/gradle/SynchronizedNotifications samples/${PLATFORM_NAME}/wearable/SynchronizedNotifications -# developers/build/prebuilts/gradle/Timer samples/${PLATFORM_NAME}/wearable/Timer -# developers/build/prebuilts/gradle/WatchViewStub samples/${PLATFORM_NAME}/wearable/WatchViewStub +developers/build/prebuilts/gradle/AgendaData samples/${PLATFORM_NAME}/wearable/AgendaData +developers/build/prebuilts/gradle/DataLayer samples/${PLATFORM_NAME}/wearable/DataLayer +developers/build/prebuilts/gradle/DelayedConfirmation samples/${PLATFORM_NAME}/wearable/DelayedConfirmation +developers/build/prebuilts/gradle/ElizaChat samples/${PLATFORM_NAME}/wearable/ElizaChat +developers/build/prebuilts/gradle/EmbeddedApp samples/${PLATFORM_NAME}/wearable/EmbeddedApp +developers/build/prebuilts/gradle/FindMyPhone samples/${PLATFORM_NAME}/wearable/FindMyPhone +developers/build/prebuilts/gradle/Flashlight samples/${PLATFORM_NAME}/wearable/Flashlight +developers/build/prebuilts/gradle/Geofencing samples/${PLATFORM_NAME}/wearable/Geofencing +developers/build/prebuilts/gradle/GridViewPager samples/${PLATFORM_NAME}/wearable/GridViewPager +developers/build/prebuilts/gradle/JumpingJack samples/${PLATFORM_NAME}/wearable/JumpingJack +developers/build/prebuilts/gradle/Notifications samples/${PLATFORM_NAME}/wearable/Notifications +developers/build/prebuilts/gradle/Quiz samples/${PLATFORM_NAME}/wearable/Quiz +developers/build/prebuilts/gradle/RecipeAssistant samples/${PLATFORM_NAME}/wearable/RecipeAssistant +developers/build/prebuilts/gradle/SkeletonWearableApp samples/${PLATFORM_NAME}/wearable/SkeletonWearableApp +developers/build/prebuilts/gradle/SpeedTracker samples/${PLATFORM_NAME}/wearable/SpeedTracker +developers/build/prebuilts/gradle/SynchronizedNotifications samples/${PLATFORM_NAME}/wearable/SynchronizedNotifications +developers/build/prebuilts/gradle/Timer samples/${PLATFORM_NAME}/wearable/Timer +developers/build/prebuilts/gradle/WatchViewStub samples/${PLATFORM_NAME}/wearable/WatchViewStub # Old sample tree development/samples/AccelerometerPlay samples/${PLATFORM_NAME}/legacy/AccelerometerPlay |