tree b74020df6412c509f9ceea9f561bdf1d089e81e5
parent 50a5d5da7e8e71fc13c19ee635fa3a83498c80cc
parent e5288e6b69b86d7394adb9d3904e228501aad24b
author Tianjie Xu <xunchang@google.com> 1572991647 -0800
committer android-build-merger <android-build-merger@google.com> 1572991647 -0800

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

Change-Id: I02c35302868aacdbc5ff513034f42e475a0805c7