Merge "cherrypick from hc-mr2 Change-Id: I0c3a19f11790142d8dbc7bdf354542c69c3c754f"

This commit is contained in:
Robert Ly 2011-09-22 11:02:52 -07:00 committed by Android (Google) Code Review
commit a871bae5fc

Diff Content Not Available