OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not...
authorDoris Ling <dling@google.com>
Thu, 9 Aug 2018 22:19:19 +0000 (15:19 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 9 Aug 2018 22:19:19 +0000 (15:19 -0700)
commit2ef0e15b665bb5b563685d6f04528a535afa55f6
tree39910ae92536ac8ca57158fce3ca43f2b0406175
parent9245b98d0f58241cdd7d0a72cf387525268bad38
parent62158f09431cad104cd6ae801d4d51be4ddb3963
[automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev
am: 62158f0943  -s ours

Change-Id: I892834c6c0655f40954ee94d98b29ac271b3de4c