tree 4b97cd01f21a5cda5469b9a31cad3c9c35fcbc36
parent b14da8aa46a3bc25d86a4c512f9398030b0c5291
parent 8f623f1fccb83720ffb494e558b94551a0d9c533
author Anthony Chen <ajchen@google.com> 1560984896 -0700
committer android-build-merger <android-build-merger@google.com> 1560984896 -0700

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

Change-Id: I2b5bd7892a3aa06fe4b8efa844da36021a02103e