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

* commit '162dd490cd0b502c717db59300b3fd902f76710a':
  Merge 2fae858d from Honeycomb-mr1. do not merge.
This commit is contained in:
Xavier Ducrohet 2011-05-24 02:57:11 -07:00 committed by Android Git Automerger
commit 48a1df1192

Diff Content Not Available