am cbd31aec: Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2

* commit 'cbd31aec9f4a7367d440bfb0c9683bd481461995':
  cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e
This commit is contained in:
Robert Ly 2011-06-14 15:01:48 -07:00 committed by Android Git Automerger
commit 26571649c6

Diff Content Not Available