Commits
Jean-Baptiste Queru authored and Android Git Automerger committed 94c31c85f67M
am d4ed4363: (-s ours) am 909960ad: (-s ours) am ed9cc555: Reconcile with jb-mr1-release - do not merge * commit 'd4ed4363101201ed24795f50064fe76cb754f979':
Showing diff toa18ff6f1ae4