tree 3097d45168b65d735e73f91fc40b7dc740155d9f
parent 68f9636e63fd9bf919d7ceb152a5bf29ae669ae9
parent 4e30d0d6874296e733b65210ca626f0d85d8d4dd
author Hridya Valsaraju <hridya@google.com> 1537820106 -0700
committer android-build-merger <android-build-merger@google.com> 1537820106 -0700

Merge "Enter into userspace fastboot only if the device supports it" am: c2e6f0410c
am: 4e30d0d687

Change-Id: Ibc7f6627e6f4dc246158bd7d9c44e26af4243334