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