OSDN Git Service

am bebb2b54: am 7b734fd8: Merge "Allow multiple asset directories in aapt" into klp...
authorAdam Lesinski <adamlesinski@google.com>
Wed, 5 Feb 2014 00:56:13 +0000 (00:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 5 Feb 2014 00:56:13 +0000 (00:56 +0000)
commit9cee77b3704eaeee30b724590fe62ad5a8305339
tree5027c14cbae22311a0bbba674a05b4dcead1279d
parent19753f458bc5ec546f4c5bb304072a53b4f9357f
parentbebb2b54cee7a0fbf9419f6cc8659a8b16a37bd0
am bebb2b54: am 7b734fd8: Merge "Allow multiple asset directories in aapt" into klp-modular-dev

* commit 'bebb2b54cee7a0fbf9419f6cc8659a8b16a37bd0':
  Allow multiple asset directories in aapt