tree 8b632efc290e75ce6af4bb625de00baace1ba4a0
parent 70119929549b6d241244c51952ed1f4a313a5ff7
parent 490db31b851af9195f8f5bd4c5b21f59be56b207
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