| commit | 0bfe7f327cae484200dac899e5b6b31b4b52a62d | [log] [tgz] |
|---|---|---|
| author | Simon Wilson <simonwilson@google.com> | Thu Mar 17 16:27:36 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 17 16:27:36 2011 -0700 |
| tree | 6d302b8230f6d9b97166fd1b6edc92878f6eb949 | |
| parent | 4627a6e60aa8f5f014aabf1a830ed6437125939d [diff] | |
| parent | 0620ebd7c47d79e95ed1048abd4317aa136bc0dd [diff] |
am 0620ebd7: (-s ours) am 3fa3721e: (-s ours) am 3f5995da: Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread * commit '0620ebd7c47d79e95ed1048abd4317aa136bc0dd': DO NOT MERGE Add images to ERI icon list