Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2

This commit is contained in:
Robert Ly 2011-06-14 17:45:04 -07:00 committed by Android (Google) Code Review
commit 9396bd944d

Diff Content Not Available