From: Xavier Ducrohet <xav@android.com>
Date: Mon, 17 Sep 2012 19:08:29 +0000 (-0700)
Subject: am 8a67598e: am cc9747ed: am d7252571: Merge "Add --error-on-failed-insert option... 
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/265e9fb4152fa410aacd0fd336221f9db1bf4eb1?hp=--cc

am 8a67598e: am cc9747ed: am d7252571: Merge "Add --error-on-failed-insert option to aapt."

* commit '8a67598eb780560b7efe4e1d9944c7cbcf83bbb1':
  Add --error-on-failed-insert option to aapt.
---

265e9fb4152fa410aacd0fd336221f9db1bf4eb1