am af574136: Support lib: use /samples directory. do not merge.

* commit 'af57413607d91e6fbd1f19ddc2292f7943e7db27':
  Support lib: use /samples directory. do not merge.
This commit is contained in:
Raphael Moll
2012-03-12 12:30:20 -07:00
committed by Android Git Automerger

View File

@@ -225,10 +225,11 @@ development/sdk/support_README.txt
sdk/files/sdk_files_NOTICE.txt extras/android/support/NOTICE.txt sdk/files/sdk_files_NOTICE.txt extras/android/support/NOTICE.txt
${OUT_DIR}/target/common/obj/PACKAGING/android-support-v4_intermediates/android-support-v4.jar extras/android/support/v4/android-support-v4.jar ${OUT_DIR}/target/common/obj/PACKAGING/android-support-v4_intermediates/android-support-v4.jar extras/android/support/v4/android-support-v4.jar
frameworks/support/v4 extras/android/support/v4/src frameworks/support/v4 extras/android/support/v4/src
development/samples/Support4Demos extras/android/support/v4/samples/Support4Demos development/samples/Support4Demos extras/android/support/samples/Support4Demos
${OUT_DIR}/target/common/obj/PACKAGING/android-support-v13_intermediates/android-support-v13.jar extras/android/support/v13/android-support-v13.jar ${OUT_DIR}/target/common/obj/PACKAGING/android-support-v13_intermediates/android-support-v13.jar extras/android/support/v13/android-support-v13.jar
frameworks/support/v13 extras/android/support/v13/src frameworks/support/v13 extras/android/support/v13/src
development/samples/Support13Demos extras/android/support/v13/samples/Support13Demos development/samples/Support13Demos extras/android/support/samples/Support13Demos
development/sdk/prebuilt/v7 extras/android/support/v7 development/sdk/prebuilt/v7 extras/android/support/v7