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