am 67f09cd0: (-s ours) am d6ce6791: Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into gingerbread

* commit '67f09cd090adae6365ca36546b0a517e51255876':
  Cherrypick d1ed33c4 from hc-mr1. do not merge.
This commit is contained in:
Xavier Ducrohet 2011-06-07 15:09:39 -07:00 committed by Android Git Automerger
commit 4eed1b7dca

Diff Content Not Available