tree 52e5c4add20fb0beb0e79867488d59baefca4bf1
parent 8d85138d46da2914aa5d655f5a5db987bafb4b6f
parent 515027d322fd58ce8555dd32ffd5309c772a8bfa
author Winson Chung <winsonc@google.com> 1321658561 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321658561 -0800

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

* commit '515027d322fd58ce8555dd32ffd5309c772a8bfa':
  Minor fixes to Launcher