]> git.saurik.com Git - android/aapt.git/commitdiff
am 2be56ccb: Merge "Add --auto-add-overlay option to aapt. DO NOT MERGE" into eclair
authorXavier Ducrohet <xav@google.com>
Sat, 13 Feb 2010 01:52:28 +0000 (17:52 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 13 Feb 2010 01:52:28 +0000 (17:52 -0800)
Merge commit '2be56ccbcff9d5f7b9b3cc0fed3825d4f037ff6a' into eclair-plus-aosp

* commit '2be56ccbcff9d5f7b9b3cc0fed3825d4f037ff6a':
  Add --auto-add-overlay option to aapt. DO NOT MERGE


Trivial merge