tree 3cd057a4a43c91962eb591e308cfc821ab002cf4
parent 834fc23d0d151863afb8cda14084fe0e4dd8abd8
parent 46cc524a6c45d169750290f06672ee6343af51d7
author Xavier Ducrohet <xav@android.com> 1348697659 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348697659 -0700

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.