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

am 51ce1607: am 46cc524a: (-s ours) am f7243dcc: Add --error-on-failed-insert option to aapt. do not merge.

* commit '51ce1607b392bf463e4175596d0b91dc337f4c14':
  Add --error-on-failed-insert option to aapt. do not merge.
---