tree 66a58fc9b76a40b0514868da97ee8200757d4aed
parent 1313c29c99489d5b9d6789b43bcd290f4afcc4ed
parent 601cac2f3e2f3ce13d8e2e07dbe51945686044eb
author Winson Chung <winsonc@google.com> 1321645489 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321645489 -0800

am 601cac2f: Merge "Minor fixes to Launcher" into ics-mr1

* commit '601cac2f3e2f3ce13d8e2e07dbe51945686044eb':
  Minor fixes to Launcher