OSDN Git Service

am bb964f00: am 432cd6dd: Merge "Allow LOCAL_RESOURCE_DIR pointing to dir generated...
authorYing Wang <wangying@google.com>
Wed, 25 Jun 2014 23:03:02 +0000 (23:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 25 Jun 2014 23:03:02 +0000 (23:03 +0000)
commit01b179bf3b5c4c0307e0efb4004a1c44705fe780
tree787d845f77cb401fadd697988a320f5cbf2561fd
parent0858c65a4d2e9cda9b9a6017bc1f4bf32125cafc
parentbb964f00403a23d2f1ec3313f7b579a9e7f0f12a
am bb964f00: am 432cd6dd: Merge "Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build"

* commit 'bb964f00403a23d2f1ec3313f7b579a9e7f0f12a':
  Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build
core/package_internal.mk
core/static_java_library.mk