tree 8adfbd3bf2b3bd45ed771d6becc40a9fe448a54d
parent 88ec485f392e30cd6e29bc6aedf3c598109c0aed
parent 83739b6db95d1e6938b8283363c576ab99e1a3b2
author TreeHugger Robot <treehugger-gerrit@google.com> 1602130210 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602130210 +0000

Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev am: 83739b6db9

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

Change-Id: I52b4099eca7e8c8069b7fd7446784aae1a0569bc