Merge "DO NOT MERGE. Integrate from MR 1 to fix issue #5366535: Lockscreen..." into ics-mr0

This commit is contained in:
Dianne Hackborn 2011-12-07 15:00:05 -08:00 committed by Android (Google) Code Review
commit 7c3885169d

Diff Content Not Available