From: Xavier Ducrohet <xav@google.com>
Date: Sat, 13 Feb 2010 01:55:17 +0000 (-0800)
Subject: am ddcf25ea: (-s ours) am 2be56ccb: Merge "Add --auto-add-overlay option to aapt... 
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/65e6371ed104cb80ea8a0cee0f31c07362bc1fff

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

Merge commit 'ddcf25ea7e1b21b908da73000630c72d6fa146b4'

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

65e6371ed104cb80ea8a0cee0f31c07362bc1fff