tree 363541f598f5259a0b2d5244f41040f217e133da
parent 672dbc997c47793eea36bd42c46e37f5cef729d5
parent fa36d922fa1627fa9ef013dcfb36a1b799f37032
author TreeHugger Robot <treehugger-gerrit@google.com> 1602137658 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602137658 +0000

Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev am: 83739b6db9 am: a2a586a61a am: d29dc3d991 am: e7069bce3c am: f1c038465d am: 488660a841 am: fa36d922fa

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12735135

Change-Id: Ib9900b5a57bee76a417bd17b8cebb086821bf649