tree a89715473b29f44bc5a26c23bcc5dfc1b7907b87
parent 3d95692b5e4a5ff8912643e99e09d336771810ac
parent 16147d1bd6ab4cbf0fb20d32c9db42fa741b1eaa
author Hridya Valsaraju <hridya@google.com> 1536800458 -0700
committer android-build-merger <android-build-merger@google.com> 1536800458 -0700

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

Change-Id: I475f0f48b4deab9c858fb7e5bd699e94d9a1b89e