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