]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 498b6cb 6173c93)
am 51ce1607: am 46cc524a: (-s ours) am f7243dcc: Add --error-on-failed-insert option...
authorXavier Ducrohet <xav@android.com>
Wed, 26 Sep 2012 22:15:43 +0000 (15:15 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Sep 2012 22:15:43 +0000 (15:15 -0700)
* commit '51ce1607b392bf463e4175596d0b91dc337f4c14':
  Add --error-on-failed-insert option to aapt. do not merge.


Trivial merge
mirror of aapt