am 56c1077d: am c9d6af6b: Merge "Add the stub src dir to the leanback extras." into klp-modular-dev

* commit '56c1077d131cf807563eb7b8e8bc2263f8bb1748':
  Add the stub src dir to the leanback extras.
This commit is contained in:
Tim Kilbourn
2014-03-24 19:35:16 +00:00
committed by Android Git Automerger

View File

@@ -396,7 +396,7 @@ development/samples/Support7Demos
# TODO: add .project, .classpath, etc. # TODO: add .project, .classpath, etc.
frameworks/support/v7/recyclerview/README.txt extras/android/support/v7/recyclerview/README.txt frameworks/support/v7/recyclerview/README.txt extras/android/support/v7/recyclerview/README.txt
frameworks/support/v7/recyclerview/AndroidManifest.xml extras/android/support/v7/recyclerview/AndroidManifest.xml frameworks/support/v7/recyclerview/AndroidManifest.xml extras/android/support/v7/recyclerview/AndroidManifest.xml
${OUT_DIR}/target/common/obj/PACKAGING/android-support-v7-recyclerview_intermediates/android-support-v7-recyclerview.jar extras/android/support/v7/recyclerview/android-support-v7-recyclerview.jar ${OUT_DIR}/target/common/obj/PACKAGING/android-support-v7-recyclerview_intermediates/android-support-v7-recyclerview.jar extras/android/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar
frameworks/support/v17/leanback/README.txt extras/android/support/v17/leanback/README.txt frameworks/support/v17/leanback/README.txt extras/android/support/v17/leanback/README.txt
frameworks/support/v17/leanback/.project extras/android/support/v17/leanback/.project frameworks/support/v17/leanback/.project extras/android/support/v17/leanback/.project
@@ -404,6 +404,7 @@ frameworks/support/v17/leanback/.classpath
frameworks/support/v17/leanback/AndroidManifest.xml extras/android/support/v17/leanback/AndroidManifest.xml frameworks/support/v17/leanback/AndroidManifest.xml extras/android/support/v17/leanback/AndroidManifest.xml
frameworks/support/v17/leanback/project.properties extras/android/support/v17/leanback/project.properties frameworks/support/v17/leanback/project.properties extras/android/support/v17/leanback/project.properties
frameworks/support/v17/leanback/res extras/android/support/v17/leanback/res frameworks/support/v17/leanback/res extras/android/support/v17/leanback/res
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
############################################################################## ##############################################################################