am 9bce27a9: (-s ours) am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread

* commit '9bce27a9ce916bdf363667ee67fc0ce50c533aa3':
  CherryPick 06942bc4 from hc-mr1. do not merge.
This commit is contained in:
Xavier Ducrohet 2011-06-28 18:58:09 -07:00 committed by Android Git Automerger
commit b05d71e51c

Diff Content Not Available