OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE Make a copy of data stored in LockSettingsSt...
authorRich Cannings <richc@google.com>
Thu, 4 Apr 2019 02:44:07 +0000 (19:44 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 4 Apr 2019 02:44:07 +0000 (19:44 -0700)
commit4fd16e01ba5ba03ae4043541aca1b8ea0e62b666
tree5af6fb016c6426245211d7020451146ed214c784
parent1ea486b5ca1fcaf5391efececa1eef392f0f8684
parente5b407a224625a157fff9718cecfbfdcb97b1975
[automerger skipped] Merge "DO NOT MERGE Make a copy of data stored in LockSettingsStorage cache" into pi-dev am: 9bdc35b2df
am: e5b407a224 -s ours
am skip reason: subject contains skip directive

Change-Id: If7fa68f065e97db5f38537c8ffe10b7344e5b846