Commits
The Android Open Source Project authored and Android Git Automerger committed cdd398b03aeM
am f05e2d25: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit 'f05e2d25372a47f5ff3b2d0c122d5ca8c3786238':
Showing diff to64d592129e4