From: Xavier Ducrohet <xav@android.com>
Date: Wed, 26 Sep 2012 22:14:19 +0000 (-0700)
Subject: am 46cc524a: (-s ours) am f7243dcc: Add --error-on-failed-insert option to aapt.... 
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/6173c931f72d79ac860283edf0ceed9182fd6b8f

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.
---

6173c931f72d79ac860283edf0ceed9182fd6b8f