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.
This commit is contained in:
Xavier Ducrohet
2012-09-26 15:14:19 -07:00
committed by Android Git Automerger

Diff Content Not Available