Commits
Xavier Ducrohet authored and Android Git Automerger committed e73e77e5ebdM
am 311f9493: (-s ours) am af83d4ec: (-s ours) am c7b87766: Merge 2402ad60 from honeycomb-mr1. do not merge. * commit '311f9493dfa88d455ff0ea25f86e508a6852682d': Merge 2402ad60 from honeycomb-mr1. do not merge.
Showing diff to31e61185a6c