am 9d9a7466: (-s ours) am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread

* commit '9d9a7466cd051748ba656acd39265099294c4153':
  Merge 2fae858d from Honeycomb-mr1. do not merge.
This commit is contained in:
Xavier Ducrohet 2011-05-23 10:21:49 -07:00 committed by Android Git Automerger
commit 8d54f983ba

Diff Content Not Available