Commits
Xavier Ducrohet authored and Android Git Automerger committed d0bc3ad8aecM
am d7542263: (-s ours) am 155cf6c1: (-s ours) am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread * commit 'd7542263c6dfa2522e8844c7c714fbf2ad112385': CherryPick 988eeeb5 from hc-mr1. do not merge.
Showing diff toe28fbd61d86