Commits
Jean-Baptiste Queru authored and Android Git Automerger committed 624eac3d770M
am 8298c5b8: am 94c31c85: am d4ed4363: (-s ours) am 909960ad: (-s ours) am ed9cc555: Reconcile with jb-mr1-release - do not merge * commit '8298c5b8ffbf0d8d172a9394e3a9a9cf8ec7e554':
Showing diff to17100f3976a