tree a89715473b29f44bc5a26c23bcc5dfc1b7907b87
parent bdc7b7e0719968e90f00320fcfc359bdde73ebab
parent 20b29bbbbd34e2ee2fd265437c93024b6cf0d136
author Hridya Valsaraju <hridya@google.com> 1536800763 -0700
committer android-build-merger <android-build-merger@google.com> 1536800763 -0700

Merge "Allow switch to fastbootd when userdata wipe is required" am: 16147d1bd6
am: 20b29bbbbd

Change-Id: Ibbf99302158a72b4f8170bb8fe3fc30db4b78cda