tree ab67fa053999f574df4b944131d37609f331db41
parent 55f57c49cf333a6015befe38131ef8a78a091171
parent b3e22d99c1682642352cec71aace0adcef7296a6
author Michael Jurka <mikejurka@google.com> 1320180699 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1320180699 -0700

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