tree a1e61ad973daca640e8aa025821fdf62df19fc31
parent af64e751e2373790dd661be80b11a03332712e90
parent 3f5995da76541443b7c071bd3acad7590ba222ec
author Simon Wilson <simonwilson@google.com> 1300404046 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300404046 -0700

am 3f5995da: Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread

* commit '3f5995da76541443b7c071bd3acad7590ba222ec':
  DO NOT MERGE Add images to ERI icon list