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