am d7542263: (-s ours) am 155cf6c1: (-s ours) am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread

* commit 'd7542263c6dfa2522e8844c7c714fbf2ad112385':
  CherryPick 988eeeb5 from hc-mr1. do not merge.
This commit is contained in:
Xavier Ducrohet 2011-06-28 18:58:23 -07:00 committed by Android Git Automerger
commit 1498c97163

Diff Content Not Available