tree ab67fa053999f574df4b944131d37609f331db41
parent 6fe99005c55b2a9aefe8bd93a3a18e7b8ec56ca5
parent e4410ec01379b938033f759f644bcbfcd58d4e25
author Michael Jurka <mikejurka@google.com> 1320180810 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320180810 +0000

am e4410ec0: Merge "Potential fix for launcher lockup (5369863)" into ics-mr1

* commit 'e4410ec01379b938033f759f644bcbfcd58d4e25':
  Potential fix for launcher lockup (5369863)