Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1

* changes:
  DO NOT MERGE : cherry pick of change Ieb7ae26b from master
  DO NOT MERGE : cherry pick of change I0f9f2c65 from master
This commit is contained in:
Teng-Hui Zhu 2011-04-07 14:17:52 -07:00 committed by Android (Google) Code Review
parent decffc4e2f
commit 8d314a934e

Diff Content Not Available