From: Jean-Baptiste Queru <jbq@google.com>
Date: Thu, 2 Sep 2010 19:08:37 +0000 (-0700)
Subject: am d0743dfb: resolved conflicts for merge of bd6abed3 to gingerbread-plus-aosp
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/a05cd008c6afe18b77d51b63d839558a332e1477

am d0743dfb: resolved conflicts for merge of bd6abed3 to gingerbread-plus-aosp

Merge commit 'd0743dfbeeb1fb5d63a6be2631e9aa2107233291'

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

a05cd008c6afe18b77d51b63d839558a332e1477