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

* commit 'c7c1ba5071456a813abbdadfdbe94287b06877e7':
  cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
This commit is contained in:
Robert Ly 2011-06-20 09:44:59 -07:00 committed by Android Git Automerger
commit 20d6fbd94c

Diff Content Not Available