Merge "Whoops, need to acquire lock." into ics-mr1

This commit is contained in:
Dianne Hackborn 2011-11-15 19:04:11 -08:00 committed by Android (Google) Code Review
commit f81caa67c0

Diff Content Not Available