]> git.saurik.com Git - android/aapt.git/commit
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)
commita05cd008c6afe18b77d51b63d839558a332e1477
treea62fd3407068ede4b5e3ef137ce7b802e8129df2
parentc6353f67fd5d2c82abec98219f65eaa701fda757
parent0317e70f19be4f19126432fc76b3ad4be99fdd95
am d0743dfb: resolved conflicts for merge of bd6abed3 to gingerbread-plus-aosp

Merge commit 'd0743dfbeeb1fb5d63a6be2631e9aa2107233291'

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