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

This commit is contained in:
Robert Ly 2011-06-14 14:55:35 -07:00 committed by Android (Google) Code Review
commit aefe60df4a

Diff Content Not Available