OSDN Git Service

am 7b734fd8: Merge "Allow multiple asset directories in aapt" into klp-modular-dev
authorAdam Lesinski <adamlesinski@google.com>
Wed, 5 Feb 2014 00:49:37 +0000 (00:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 5 Feb 2014 00:49:37 +0000 (00:49 +0000)
commitbebb2b54cee7a0fbf9419f6cc8659a8b16a37bd0
treee7ecbe49970cc33140ae0c0353301f1b8f34a670
parentbbfebfad0d8ad002995bb1005b61a35b42a8ce35
parent7b734fd8d163f7a71254b909fbbcd358129924b7
am 7b734fd8: Merge "Allow multiple asset directories in aapt" into klp-modular-dev

* commit '7b734fd8d163f7a71254b909fbbcd358129924b7':
  Allow multiple asset directories in aapt
core/package.mk