Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1

This commit is contained in:
Justin Ho 2011-12-16 11:52:08 -08:00 committed by Android (Google) Code Review
commit fe7a2124ae

Diff Content Not Available