Commits
The Android Open Source Project authored and Android Git Automerger committed 6b0693a318fM
am 8f4e09d2: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '8f4e09d2a8213d64edacc081879aaadd56b961bc':
Showing diff to8f4e09d2a82