| commit | ab5c9d9743c6a89f6777f935e8b24f03c0782da3 | [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 | 81fd08bdd7bcc78fe174c93097ba1975a650ae6e | |
| parent | 854ad68046bb8eecec541782f9c8c18e405c3fe7 [diff] | |
| parent | c90e4fc75eec001eb123b08954ac4fcfca28f366 [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