tree 52e5c4add20fb0beb0e79867488d59baefca4bf1
parent 23ba50c1088e8db0d747d8dad2273afa157ca198
parent ae9940a1597a6818a6252495f6d394824d196db0
author Winson Chung <winsonc@google.com> 1321658869 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321658869 -0800

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

* commit 'ae9940a1597a6818a6252495f6d394824d196db0':
  Minor fixes to Launcher