]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c6353f6 0317e70)
am d0743dfb: resolved conflicts for merge of bd6abed3 to gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Thu, 2 Sep 2010 19:08:37 +0000 (12:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 2 Sep 2010 19:08:37 +0000 (12:08 -0700)
Merge commit 'd0743dfbeeb1fb5d63a6be2631e9aa2107233291'

* commit 'd0743dfbeeb1fb5d63a6be2631e9aa2107233291':
  Add a --debug-mode option to aapt.


Trivial merge
mirror of aapt