]> git.saurik.com Git - android/aapt.git/commitdiff
am 8a67598e: am cc9747ed: am d7252571: Merge "Add --error-on-failed-insert option...
authorXavier Ducrohet <xav@android.com>
Mon, 17 Sep 2012 19:08:29 +0000 (12:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Sep 2012 19:08:29 +0000 (12:08 -0700)
* commit '8a67598eb780560b7efe4e1d9944c7cbcf83bbb1':
  Add --error-on-failed-insert option to aapt.


Trivial merge