tree 72bad26c51ed9eb38765a870cd2888a8a55370d0
parent dee4a349cbfd9cb8fd3999d8dc2c4726fe6ae549
parent ad87c8bbbfeede3e0a370ce3253a1be9b612eb05
author John Hoford <hoford@google.com> 1350080252 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350080252 -0700

am 9b302e31: Icon fix

* commit '9b302e31fb92408e1b631988320981910edb8c37':
  Icon fix