tree f1aec4cabb7c96afd330e3a82f95c15acfeb7a59
parent a5bad557549ec3c812cc5e246414d328b53db377
parent c3ef5269d0c1853da32708b3c980811e1fa91471
author Treehugger Robot <treehugger-gerrit@google.com> 1602678591 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602678591 +0000

[automerger skipped] Merge "Fix storing the wrong value of mLockdown in setting" am: 59ce8cd45c am: 2099fa5a9d -s ours am: 9ed7a74518 -s ours am: c3ef5269d0 -s ours

am skip reason: Change-Id Ie85a347216614b7873bfdf199165d89527ada3a8 with SHA-1 9226fc3723 is in history

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

Change-Id: I9661b148b00da96490ae77c50d59f43d0953f106