tree a89715473b29f44bc5a26c23bcc5dfc1b7907b87
parent 466f59f7c127a4d12cc90ee234f53cc1522e2402
parent 165478c774d9037c691b14b3fe6988ed12c7177c
author Hridya Valsaraju <hridya@google.com> 1536801613 -0700
committer android-build-merger <android-build-merger@google.com> 1536801613 -0700

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

Change-Id: Id8998826195d7433d4ef8389b08c7017279db014