| commit | 9cee77b3704eaeee30b724590fe62ad5a8305339 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Wed Feb 05 00:56:13 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 05 00:56:13 2014 +0000 |
| tree | 5027c14cbae22311a0bbba674a05b4dcead1279d | |
| parent | 19753f458bc5ec546f4c5bb304072a53b4f9357f [diff] | |
| parent | bebb2b54cee7a0fbf9419f6cc8659a8b16a37bd0 [diff] |
am bebb2b54: am 7b734fd8: Merge "Allow multiple asset directories in aapt" into klp-modular-dev * commit 'bebb2b54cee7a0fbf9419f6cc8659a8b16a37bd0': Allow multiple asset directories in aapt