OSDN Git Service

am 9cee77b3: am bebb2b54: am 7b734fd8: Merge "Allow multiple asset directories in...
authorAdam Lesinski <adamlesinski@google.com>
Fri, 21 Feb 2014 18:34:38 +0000 (10:34 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Feb 2014 18:34:38 +0000 (10:34 -0800)
commit3b2539286fbad59d999c8d2bd3ba65142bc01bac
tree4566328257059c9f61ae376b13cf6a2dbc2391d7
parentc94a531b086aed89fd90c12d9ec8a722c156b4e3
parent9cee77b3704eaeee30b724590fe62ad5a8305339
am 9cee77b3: am bebb2b54: am 7b734fd8: Merge "Allow multiple asset directories in aapt" into klp-modular-dev

* commit '9cee77b3704eaeee30b724590fe62ad5a8305339':
  Allow multiple asset directories in aapt