Commits
Jean-Baptiste Queru authored and Android Git Automerger committed 4d8032b5e67M
am f3b63ed1: am 67128cbc: (-s ours) am 18cd9793: (-s ours) am 84d3036c: (-s ours) am ed9cc555: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'f3b63ed11a5a7e9b19bcfe8b42f9cd9c029e6a14':
Showing diff toda2a4a5048a