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.