am 0014f87c: Merge "Fixes AppCompat build location" into jb-mr2-dev

* commit '0014f87c54890cb21ade6162caf5ff63f6805d28':
  Fixes AppCompat build location
This commit is contained in:
Chris Banes
2013-03-25 20:49:06 +00:00
committed by Android Git Automerger

View File

@@ -267,7 +267,7 @@ frameworks/support/v7/appcompat/AndroidManifest.xml
frameworks/support/v7/appcompat/project.properties extras/android/support/v7/appcompat/project.properties
frameworks/support/v7/appcompat/res extras/android/support/v7/appcompat/res
frameworks/support/v7/appcompat/src/.readme extras/android/support/v7/appcompat/src/.readme
${OUT_DIR}/target/common/obj/PACKAGING/android-support-v7-appcompat_intermediates/android-support-v7-appcompat.jar extras/android/support/appcompat/libs/android-support-v7-appcompat.jar
${OUT_DIR}/target/common/obj/PACKAGING/android-support-v7-appcompat_intermediates/android-support-v7-appcompat.jar extras/android/support/v7/appcompat/libs/android-support-v7-appcompat.jar
frameworks/support/v7/mediarouter/README.txt extras/android/support/v7/mediarouter/README.txt
frameworks/support/v7/mediarouter/.project extras/android/support/v7/mediarouter/.project