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

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

Diff Content Not Available