am 5b9ec687: (-s ours) am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge.

* commit '5b9ec6871afaf40325abe602cd1d29ddbd88cbb9':
  Merge e57aa434 from honeycomb-mr1. do not merge.
This commit is contained in:
Xavier Ducrohet
2011-05-23 10:22:00 -07:00
committed by Android Git Automerger

Diff Content Not Available