Commits
Xavier Ducrohet authored and Android Git Automerger committed f24ed1c2725M
am 3eb9f832: (-s ours) am 67f09cd0: (-s ours) am d6ce6791: Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into gingerbread * commit '3eb9f8326e6d72be671bf0226965ca3231a25d7d': Cherrypick d1ed33c4 from hc-mr1. do not merge.
Showing diff to78714c1edfc