| commit | 926d1a22007d94ef2b29ec979ab6038fa8d9e40e | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Dec 10 17:57:04 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 10 17:57:04 2009 -0800 |
| tree | 23b289645646e6defbf06d5cba10cdece18030b1 | |
| parent | 4570dfa2016fa32b6f7b29aabadb9d708482b94d [diff] | |
| parent | a5a8cc13d3f906650a1eb17e20e1b26d68b78453 [diff] |
am a5a8cc13: resolved conflicts for merge of ce307f88 to eclair-mr2 Merge commit 'a5a8cc13d3f906650a1eb17e20e1b26d68b78453' into eclair-mr2-plus-aosp * commit 'a5a8cc13d3f906650a1eb17e20e1b26d68b78453': Add --custom-package to aapt