summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorTrevor Johns <trevorjohns@google.com>2015-03-31 00:12:46 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-31 00:12:46 +0000
commitedcf97efa7d796b1dd0136eeb0893c970da45cc2 (patch)
tree95e9cea180dbfe82fc761d39c0603a3cf274cbd4 /build
parent70aad0f71940ce49d75847668165b8a9aae80951 (diff)
parentb2c35d1597aace199282148142249a3b14bd95f3 (diff)
downloadandroid_development-edcf97efa7d796b1dd0136eeb0893c970da45cc2.tar.gz
android_development-edcf97efa7d796b1dd0136eeb0893c970da45cc2.tar.bz2
android_development-edcf97efa7d796b1dd0136eeb0893c970da45cc2.zip
am b2c35d15: am 2298d3b4: am 0d473ea1: am 721cd1b8: am 77b5d394: Update sdk.atree and samples/browseable for lastest samples release
* commit 'b2c35d1597aace199282148142249a3b14bd95f3': Update sdk.atree and samples/browseable for lastest samples release
Diffstat (limited to 'build')
-rw-r--r--build/sdk.atree7
1 files changed, 3 insertions, 4 deletions
diff --git a/build/sdk.atree b/build/sdk.atree
index 613fb90c9..82a1d28e5 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -276,9 +276,7 @@ developers/build/prebuilts/gradle/CardReader sam
developers/build/prebuilts/gradle/BatchStepSensor samples/${PLATFORM_NAME}/sensors/BatchStepSensor
developers/build/prebuilts/gradle/DisplayingBitmaps samples/${PLATFORM_NAME}/ui/DisplayingBitmaps
developers/build/prebuilts/gradle/BasicTransition samples/${PLATFORM_NAME}/ui/BasicTransition
-developers/build/prebuilts/gradle/AdapterTransition samples/${PLATFORM_NAME}/ui/AdapterTransition
developers/build/prebuilts/gradle/CustomTransition samples/${PLATFORM_NAME}/ui/CustomTransition
-developers/build/prebuilts/gradle/FragmentTransition samples/${PLATFORM_NAME}/ui/FragmentTransition
developers/build/prebuilts/gradle/SwipeRefreshLayoutBasic samples/${PLATFORM_NAME}/ui/SwipeRefreshLayoutBasic
developers/build/prebuilts/gradle/SwipeRefreshListFragment samples/${PLATFORM_NAME}/ui/SwipeRefreshListFragment
developers/build/prebuilts/gradle/SwipeRefreshMultipleViews samples/${PLATFORM_NAME}/ui/SwipeRefreshMultipleViews
@@ -311,6 +309,8 @@ developers/build/prebuilts/gradle/PermissionRequest sam
developers/build/prebuilts/gradle/DirectorySelection samples/${PLATFORM_NAME}/content/documentsUi/DirectorySelection
developers/build/prebuilts/gradle/AppUsageStatistics samples/${PLATFORM_NAME}/system/AppUsageStatistics
developers/build/prebuilts/gradle/ScreenCapture samples/${PLATFORM_NAME}/media/ScreenCapture
+developers/build/prebuilts/gradle/NfcProvisioning samples/${PLATFORM_NAME}/nfc/NfcProvisioning
+developers/build/prebuilts/gradle/DeviceOwner samples/${PLATFORM_NAME}/admin/DeviceOwner
developers/build/prebuilts/androidtv samples/${PLATFORM_NAME}/androidtv
@@ -319,7 +319,6 @@ developers/build/prebuilts/gradle/AgendaData samples/${PLATFO
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
@@ -334,6 +333,7 @@ developers/build/prebuilts/gradle/SynchronizedNotifications samples/${PLATFO
developers/build/prebuilts/gradle/Timer samples/${PLATFORM_NAME}/wearable/Timer
developers/build/prebuilts/gradle/WatchFace samples/${PLATFORM_NAME}/wearable/WatchFace
developers/build/prebuilts/gradle/WatchViewStub samples/${PLATFORM_NAME}/wearable/WatchViewStub
+developers/build/prebuilts/gradle/XYZTouristAttractions samples/${PLATFORM_NAME}/wearable/XYZTouristAttractions
# Old sample tree
development/samples/AccelerometerPlay samples/${PLATFORM_NAME}/legacy/AccelerometerPlay
@@ -499,4 +499,3 @@ ${OUT_DIR}/target/common/obj/PACKAGING/android-support-design_intermediates/andr
##############################################################################
framework/layoutlib-tests.jar tests/libtests/layoutlib-tests.jar
system/app/EmulatorSmokeTests/EmulatorSmokeTests.apk tests/emulator-test-apps/EmulatorSmokeTests.apk
-