tree e03f0a512976f7dcbba4b0cd9f301ee351b995e6
parent 343987b2a1b1b7f44a855699c3d955cfdb629c27
parent c8f7b5bad735d9e5a62b349164cace19a1a74338
author Connor O'Brien <connoro@google.com> 1485317779 +0000
committer android-build-merger <android-build-merger@google.com> 1485317779 +0000

Merge "Use flash erase & logical block size for userdata wipe"
am: c8f7b5bad7

Change-Id: Ie9ad2ca457ecb6bf68a57120bcc504faaabc0871