| commit | 51ce1607b392bf463e4175596d0b91dc337f4c14 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Wed Sep 26 15:14:19 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 26 15:14:19 2012 -0700 |
| tree | 3cd057a4a43c91962eb591e308cfc821ab002cf4 | |
| parent | 834fc23d0d151863afb8cda14084fe0e4dd8abd8 [diff] | |
| parent | 46cc524a6c45d169750290f06672ee6343af51d7 [diff] |
am 46cc524a: (-s ours) am f7243dcc: Add --error-on-failed-insert option to aapt. do not merge. * commit '46cc524a6c45d169750290f06672ee6343af51d7': Add --error-on-failed-insert option to aapt. do not merge.