tree 3e66f9db3f2f3e144510c9bb42337cf18d94d75b
parent 2b6af8c8e635efa2b8377a5fc268e1b0255c4d6f
parent 2640ee504bc714105d717ab6c209902474b010e0
author TreeHugger Robot <treehugger-gerrit@google.com> 1585760056 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585760056 +0000

Merge "Fixed encoding of device_locked field" into rvc-dev am: c3939fc3d2 am: 2640ee504b

Change-Id: I8e0b063835f4d1d83c7b3305b31b37a610943bf2