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

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

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