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