Commits
The Android Open Source Project authored and Android Git Automerger committed efde4200314M
am 8ce3bb90: (-s ours) am 350b9b9b: am 9d42e438: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge * commit '8ce3bb90cdcef1bfd73b652001c0bb2cd0b2fe6b':
Showing diff tob204e46623d