tree 94771e4574714c8a45c0b1a9158009588ae1db59
parent f309453bb85ec278f0206baef898461f5b0a8874
parent 3fa3721e8f771a6edc8acdd21f567af93ddea7e1
author Simon Wilson <simonwilson@google.com> 1300404298 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300404298 -0700

am 3fa3721e: (-s ours) am 3f5995da: Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread

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