tree 6d302b8230f6d9b97166fd1b6edc92878f6eb949
parent 4627a6e60aa8f5f014aabf1a830ed6437125939d
parent 0620ebd7c47d79e95ed1048abd4317aa136bc0dd
author Simon Wilson <simonwilson@google.com> 1300404456 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300404456 -0700

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