am af83d4ec: (-s ours) am c7b87766: Merge 2402ad60 from honeycomb-mr1. do not merge.

* commit 'af83d4ecff0ad1638a1a0f3a3f9805468ed710b4':
  Merge 2402ad60 from honeycomb-mr1. do not merge.
This commit is contained in:
Xavier Ducrohet
2011-05-29 08:59:57 -07:00
committed by Android Git Automerger

Diff Content Not Available