From: Xavier Ducrohet <xav@google.com>
Date: Sat, 13 Feb 2010 01:52:28 +0000 (-0800)
Subject: am 2be56ccb: Merge "Add --auto-add-overlay option to aapt. DO NOT MERGE" into eclair
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/6dfccf061b505abafb2da9f5debf03ddb0210141

am 2be56ccb: Merge "Add --auto-add-overlay option to aapt. DO NOT MERGE" into eclair

Merge commit '2be56ccbcff9d5f7b9b3cc0fed3825d4f037ff6a' into eclair-plus-aosp

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

6dfccf061b505abafb2da9f5debf03ddb0210141