tree 55514947aaa065bb333accaa54db9369b9fb01dc
parent 0f8662eaef06614cef1f5646b62283c1703631c5
parent 7a97977a442e219b4533e33dcdc91758b64a90a9
author Winson Chung <winsonc@google.com> 1320887685 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320887685 +0000

am 7a97977a: am 7abe780f: am 4decf123: Merge "Fixing issue where AllApps labels were getting clipped (Bug: 5490118)" into ics-mr1

* commit '7a97977a442e219b4533e33dcdc91758b64a90a9':
  Fixing issue where AllApps labels were getting clipped (Bug: 5490118)