| commit | f623c29080a6a689ce7cf1e3d53ba8bb6eb4cbc8 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Sep 02 12:08:37 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 02 12:08:37 2010 -0700 |
| tree | d96c4367eda6db04812559ba7d09f38ef5941b69 | |
| parent | db16e5a673738fbac6ef195659015479f1534fc4 [diff] | |
| parent | d0743dfbeeb1fb5d63a6be2631e9aa2107233291 [diff] |
am d0743dfb: resolved conflicts for merge of bd6abed3 to gingerbread-plus-aosp Merge commit 'd0743dfbeeb1fb5d63a6be2631e9aa2107233291' * commit 'd0743dfbeeb1fb5d63a6be2631e9aa2107233291': Add a --debug-mode option to aapt.