commit | 430e80091ee2a913a24e7e8a4ce3124bbccf50a7 | [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 | 2429767bc71baa52bf6f41add0485c805e633115 | |
parent | 66d5425cd420224274f6b683e92514576e35e06a [diff] | |
parent | f819b0bc4c8ebac7de7f06fbaf349fb47f30717b [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