tree 55514947aaa065bb333accaa54db9369b9fb01dc
parent 846c3a495f47b28af22597436b3c055bbf6f0135
parent 6509b7e05f53cb2426170b3a4c22a8d2a4253dd0
author Michael Jurka <mikejurka@google.com> 1320887685 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320887685 +0000

am 6509b7e0: am f6080802: am ec8bd08a: am 929fff0e: Potential fix for launcher lockup (5369863)

* commit '6509b7e05f53cb2426170b3a4c22a8d2a4253dd0':