| commit | 82ca5ffb53ff909aa240532ebdfa1f98dc0db178 | [log] [tgz] |
|---|---|---|
| author | Raphael Moll <ralf@android.com> | Mon May 21 13:13:38 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 21 13:13:38 2012 -0700 |
| tree | e4473d4c126233e3e7ee47510a216a1998257c2b | |
| parent | 7bc6d801d384c7593ba5f2f3293024083a822995 [diff] | |
| parent | 9c06ac09c3530c5f0bc0b47a3350eedb5b539c35 [diff] |
am 9c06ac09: Merge "Merge "AAPT: support a new --ignore-assets flag."" into jb-dev * commit '9c06ac09c3530c5f0bc0b47a3350eedb5b539c35': Merge "AAPT: support a new --ignore-assets flag."