]> git.saurik.com Git - android/aapt.git/commit
am ddcf25ea: (-s ours) am 2be56ccb: Merge "Add --auto-add-overlay option to aapt...
authorXavier Ducrohet <xav@google.com>
Sat, 13 Feb 2010 01:55:17 +0000 (17:55 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 13 Feb 2010 01:55:17 +0000 (17:55 -0800)
commit65e6371ed104cb80ea8a0cee0f31c07362bc1fff
tree54c66dccc09b919944d7a6c82a0cb5fe5de8b2e8
parent2db8b02fe4c9fc0bec9ff7bf055d24942dfa6b02
parent6dfccf061b505abafb2da9f5debf03ddb0210141
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