tree 6c20dfc51ebeaf42c31df504e62950b7329fe6a7
parent 9d071388919fab803df6b7e35d1149de996dfdda
parent 713a92390eb6ee50935be9030ef52160497b9242
author Adrian Roos <roosa@google.com> 1503074050 +0000
committer android-build-merger <android-build-merger@google.com> 1503074050 +0000

Merge "LockSettings: Enforce permission check on havePattern/havePassword/systemReady" into oc-mr1-dev
am: 713a92390e

Change-Id: Iedb7368829c0b4d82c6ca8e0417340d78f180493