am 66b6f721: Merge "Update sdk.atree and samples_source.prop_template for L SDK release" into lmp-dev

* commit '66b6f721b7e20911f0764720346caca5c77fb22b':
  Update sdk.atree and samples_source.prop_template for L SDK release
This commit is contained in:
Trevor Johns
2014-10-17 18:50:56 +00:00
committed by Android Git Automerger
2 changed files with 6 additions and 1 deletions

View File

@@ -285,6 +285,11 @@ developers/build/prebuilts/gradle/ElevationBasic sam
developers/build/prebuilts/gradle/ElevationDrag samples/${PLATFORM_NAME}/ui/views/Elevation/ElevationDrag developers/build/prebuilts/gradle/ElevationDrag samples/${PLATFORM_NAME}/ui/views/Elevation/ElevationDrag
developers/build/prebuilts/gradle/ClippingBasic samples/${PLATFORM_NAME}/ui/views/Clipping/ClippingBasic developers/build/prebuilts/gradle/ClippingBasic samples/${PLATFORM_NAME}/ui/views/Clipping/ClippingBasic
developers/build/prebuilts/gradle/JobScheduler samples/${PLATFORM_NAME}/ui/views/Clipping/ClippingBasic developers/build/prebuilts/gradle/JobScheduler samples/${PLATFORM_NAME}/ui/views/Clipping/ClippingBasic
developers/build/prebuilts/gradle/HdrViewfinder samples/${PLATFORM_NAME}/media/HdrViewfinder
developers/build/prebuilts/gradle/DocumentCentricApps samples/${PLATFORM_NAME}/ui/activitytasks/DocumentCentricApps
developers/build/prebuilts/gradle/DocumentCentricRelinquishIdentity samples/${PLATFORM_NAME}/ui/activitytasks/DocumentCentricRelinquishIdentity
developers/build/prebuilts/gradle/AppRestrictionEnforcer samples/${PLATFORM_NAME}/admin/AppRestrictionEnforcer
developers/build/prebuilts/gradle/AppRestrictionSchema samples/${PLATFORM_NAME}/admin/AppRestrictionSchema
developers/build/prebuilts/androidtv samples/${PLATFORM_NAME}/androidtv developers/build/prebuilts/androidtv samples/${PLATFORM_NAME}/androidtv

View File

@@ -1,4 +1,4 @@
Pkg.UserSrc=false Pkg.UserSrc=false
Pkg.Revision=3 Pkg.Revision=1
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}