tree 7f4cc36a11f5ee45ddf7fde3e57bb25a046dc4d8
parent 7abe780f4f680c36b066ea0ca6d3ee7de0dd47bc
parent ec8bd08ad950bdfed8ad0d15f74f8f7c98fa1b3c
author Michael Jurka <mikejurka@google.com> 1320853028 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320853028 +0000

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

* commit 'ec8bd08ad950bdfed8ad0d15f74f8f7c98fa1b3c':