| commit | bebb2b54cee7a0fbf9419f6cc8659a8b16a37bd0 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Wed Feb 05 00:49:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 05 00:49:37 2014 +0000 |
| tree | e7ecbe49970cc33140ae0c0353301f1b8f34a670 | |
| parent | bbfebfad0d8ad002995bb1005b61a35b42a8ce35 [diff] | |
| parent | 7b734fd8d163f7a71254b909fbbcd358129924b7 [diff] |
am 7b734fd8: Merge "Allow multiple asset directories in aapt" into klp-modular-dev * commit '7b734fd8d163f7a71254b909fbbcd358129924b7': Allow multiple asset directories in aapt