tree 4c970d4c5da94b6468d02901f0299aad45349911
parent c3f66cafca3d011aa40bdfbbaba8a56163eebb24
parent 029a562bd8bc3fc76d4f8ed6a5ae0cf7b12455a4
author Anthony Chen <ajchen@google.com> 1560980929 -0700
committer android-build-merger <android-build-merger@google.com> 1560980929 -0700

Merge "Update unlock code to expect token and handle in a single packet." into qt-dev
am: 029a562bd8

Change-Id: I69a4f72ce9eea2ae34b4bb820cfe7d3659e70f87