tree eedb5fa55590815fd02676cd33e4cd131bfbc3fa
parent f289bba2cf46d1e834580d19dead46874c0da4f4
parent 845bf488cb2712357b7a23f4142fa264ed6a9333
author Tianjie Xu <xunchang@google.com> 1572992010 -0800
committer android-build-merger <android-build-merger@google.com> 1572992010 -0800

Merge "Start adbd in user mode if bootloader is unlocked" am: b65dd9cb0c am: e5288e6b69
am: 845bf488cb

Change-Id: I0ac1f3a38e0def87e3d06e34e49097f311da6a18