tree f656271de0aa6438bb1f98cadef065207c1d45c3
parent 2212788a1dc8f83d7b87f28d07a81f062e459427
parent 8f4f8d28185e7abe8cd1277019dc088a67e61ca1
author Shawn Willden <swillden@google.com> 1586541867 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586541867 +0000

[automerger skipped] Fixed encoding of device_locked field am: 76ce61d4ce am: 8d0cddc68b -s ours am: 4d81e5217b -s ours am: 8f4f8d2818 -s ours

am skip reason: Change-Id Ibe78d65719f78a4d64581bdef6988f1dfbd85523 with SHA-1 b0cd8a9496 is in history

Change-Id: I1227bd44fb5a5b12318edf88560783554be6670d