| commit | 7cea964212b93badd908873b5e5a4cbd2d8c6c25 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@google.com> | Fri Feb 12 17:55:17 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 12 17:55:17 2010 -0800 |
| tree | 6d7ea46208c30bf1ae9014b70d7f5f50167eaa10 | |
| parent | b125dc5599468a09d82751cd76152071ae485afb [diff] | |
| parent | ddcf25ea7e1b21b908da73000630c72d6fa146b4 [diff] |
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