am c5522cae: Merge "Revert "Disable the design support library and demos"" into lmp-mr1-ub-dev

* commit 'c5522cae8872dd761c4fe0289b63500328717e12':
  Revert "Disable the design support library and demos"
This commit is contained in:
Chris Banes
2015-04-09 07:27:58 +00:00
committed by Android Git Automerger
2 changed files with 5 additions and 0 deletions

View File

@@ -489,6 +489,11 @@ frameworks/support/v17/leanback/res
frameworks/support/v17/leanback/src/.readme extras/android/support/v17/leanback/src/.readme frameworks/support/v17/leanback/src/.readme extras/android/support/v17/leanback/src/.readme
${OUT_DIR}/target/common/obj/PACKAGING/android-support-v17-leanback_intermediates/android-support-v17-leanback.jar extras/android/support/v17/leanback/libs/android-support-v17-leanback.jar ${OUT_DIR}/target/common/obj/PACKAGING/android-support-v17-leanback_intermediates/android-support-v17-leanback.jar extras/android/support/v17/leanback/libs/android-support-v17-leanback.jar
frameworks/support/design/AndroidManifest.xml extras/android/support/design/AndroidManifest.xml
frameworks/support/design/res extras/android/support/design/res
frameworks/support/design/src/.readme extras/android/support/design/src/.readme
${OUT_DIR}/target/common/obj/PACKAGING/android-support-design_intermediates/android-support-design.jar extras/android/support/design/libs/android-support-design.jar
############################################################################## ##############################################################################
# Tests Component # Tests Component
############################################################################## ##############################################################################