Commits

30e9065c253 + fb381053d55 172b29e8b35 96706a21532
The Android Open Source Project authored 04b40ee33e0M
Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge Change-Id: I498651fc3fa9b021570780e8b8848a806c31962f
Showing diff to96706a21532