| commit | d54dda77071095891d310afa7efbea500bdefd3a | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Dec 10 23:43:25 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 10 23:43:25 2009 -0800 |
| tree | a2aa262977e508939db8167d58c18bac4726c967 | |
| parent | f1ec19e0f3fdfd63df3a3cd39721d2732259a5df [diff] | |
| parent | 926d1a22007d94ef2b29ec979ab6038fa8d9e40e [diff] |
am 926d1a22: am a5a8cc13: resolved conflicts for merge of ce307f88 to eclair-mr2 Merge commit '926d1a22007d94ef2b29ec979ab6038fa8d9e40e' * commit '926d1a22007d94ef2b29ec979ab6038fa8d9e40e': Add --custom-package to aapt