am 13ce376e: am dff4d5d4: Merge "Add two new samples." into lmp-docs

* commit '13ce376eea001a9942dc418323c3fd2980cbf299':
  Add two new samples.
This commit is contained in:
Trevor Johns
2014-11-12 19:35:00 +00:00
committed by Android Git Automerger
2 changed files with 6 additions and 4 deletions

View File

@@ -247,6 +247,11 @@ developers/build/prebuilts/gradle/ActivityInstrumentation/ sam
developers/build/prebuilts/gradle/MediaRecorder/ samples/${PLATFORM_NAME}/media/MediaRecorder developers/build/prebuilts/gradle/MediaRecorder/ samples/${PLATFORM_NAME}/media/MediaRecorder
developers/build/prebuilts/gradle/BasicMediaRouter/ samples/${PLATFORM_NAME}/media/BasicMediaRouter developers/build/prebuilts/gradle/BasicMediaRouter/ samples/${PLATFORM_NAME}/media/BasicMediaRouter
developers/build/prebuilts/gradle/BasicMediaDecoder/ samples/${PLATFORM_NAME}/media/BasicMediaDecoder developers/build/prebuilts/gradle/BasicMediaDecoder/ samples/${PLATFORM_NAME}/media/BasicMediaDecoder
developers/build/prebuilts/gradle/MediaBrowserService/ samples/${PLATFORM_NAME}/media/MediaBrowserService
developers/build/prebuilts/gradle/BasicNotifications/ samples/${PLATFORM_NAME}/notification/BasicNotifications
developers/build/prebuilts/gradle/CustomNotifications/ samples/${PLATFORM_NAME}/notification/CustomNotifications
developers/build/prebuilts/gradle/LNotifications/ samples/${PLATFORM_NAME}/notification/LNotifications
developers/build/prebuilts/gradle/MessagingService/ samples/${PLATFORM_NAME}/notification/MessagingService
developers/build/prebuilts/gradle/BorderlessButtons/ samples/${PLATFORM_NAME}/ui/BorderlessButtons developers/build/prebuilts/gradle/BorderlessButtons/ samples/${PLATFORM_NAME}/ui/BorderlessButtons
developers/build/prebuilts/gradle/BasicAccessibility/ samples/${PLATFORM_NAME}/ui/BasicAccessibility developers/build/prebuilts/gradle/BasicAccessibility/ samples/${PLATFORM_NAME}/ui/BasicAccessibility
developers/build/prebuilts/gradle/CustomChoiceList/ samples/${PLATFORM_NAME}/ui/CustomChoiceList developers/build/prebuilts/gradle/CustomChoiceList/ samples/${PLATFORM_NAME}/ui/CustomChoiceList
@@ -256,8 +261,6 @@ developers/build/prebuilts/gradle/ActionBarCompat-Styled/ sam
developers/build/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ samples/${PLATFORM_NAME}/ui/ActionBarCompat-ListPopupMenu developers/build/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ samples/${PLATFORM_NAME}/ui/ActionBarCompat-ListPopupMenu
developers/build/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ samples/${PLATFORM_NAME}/ui/ActionBarCompat-ShareActionProvider developers/build/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ samples/${PLATFORM_NAME}/ui/ActionBarCompat-ShareActionProvider
developers/build/prebuilts/gradle/ActionBarCompat-Basic/ samples/${PLATFORM_NAME}/ui/ActionBarCompat-Basic developers/build/prebuilts/gradle/ActionBarCompat-Basic/ samples/${PLATFORM_NAME}/ui/ActionBarCompat-Basic
developers/build/prebuilts/gradle/BasicNotifications/ samples/${PLATFORM_NAME}/ui/BasicNotifications
developers/build/prebuilts/gradle/CustomNotifications/ samples/${PLATFORM_NAME}/ui/CustomNotifications
developers/build/prebuilts/gradle/DoneBar/ samples/${PLATFORM_NAME}/ui/DoneBar developers/build/prebuilts/gradle/DoneBar/ samples/${PLATFORM_NAME}/ui/DoneBar
developers/build/prebuilts/gradle/BasicImmersiveMode/ samples/${PLATFORM_NAME}/ui/BasicImmersiveMode developers/build/prebuilts/gradle/BasicImmersiveMode/ samples/${PLATFORM_NAME}/ui/BasicImmersiveMode
developers/build/prebuilts/gradle/AdvancedImmersiveMode/ samples/${PLATFORM_NAME}/ui/AdvancedImmersiveMode developers/build/prebuilts/gradle/AdvancedImmersiveMode/ samples/${PLATFORM_NAME}/ui/AdvancedImmersiveMode
@@ -298,7 +301,6 @@ developers/build/prebuilts/gradle/AppRestrictionEnforcer sam
developers/build/prebuilts/gradle/AppRestrictionSchema samples/${PLATFORM_NAME}/admin/AppRestrictionSchema developers/build/prebuilts/gradle/AppRestrictionSchema samples/${PLATFORM_NAME}/admin/AppRestrictionSchema
developers/build/prebuilts/gradle/RecyclerView samples/${PLATFORM_NAME}/ui/views/RecyclerView developers/build/prebuilts/gradle/RecyclerView samples/${PLATFORM_NAME}/ui/views/RecyclerView
developers/build/prebuilts/gradle/CardView samples/${PLATFORM_NAME}/ui/views/CardView developers/build/prebuilts/gradle/CardView samples/${PLATFORM_NAME}/ui/views/CardView
developers/build/prebuilts/gradle/LNotifications samples/${PLATFORM_NAME}/ui/notifications/LNotifications
developers/build/prebuilts/gradle/DrawableTinting samples/${PLATFORM_NAME}/ui/DrawableTinting developers/build/prebuilts/gradle/DrawableTinting samples/${PLATFORM_NAME}/ui/DrawableTinting
developers/build/prebuilts/gradle/Interpolator samples/${PLATFORM_NAME}/ui/Interpolator developers/build/prebuilts/gradle/Interpolator samples/${PLATFORM_NAME}/ui/Interpolator
developers/build/prebuilts/gradle/PdfRendererBasic samples/${PLATFORM_NAME}/ui/graphics/PdfRendererBasic developers/build/prebuilts/gradle/PdfRendererBasic samples/${PLATFORM_NAME}/ui/graphics/PdfRendererBasic

View File

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