tree 7b15d0c4bc4e0b4677c8f2aeb4fef09077e7d15e
parent 4db6373235e201bf3ed494619994f731c18d3179
parent dc56d3cadd81630b21b2eb32724b495c81bffb0e
author Simon Wilson <simonwilson@google.com> 1293046147 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1293046147 -0800

am 490db31b: (-s ours) am 0c8ad64d: Merge "fix [3127755] Launcher is missing anti-aliasing" into gingerbread

* commit '490db31b851af9195f8f5bd4c5b21f59be56b207':
  fix [3127755] Launcher is missing anti-aliasing