tree 99f0d895609c3f47404444b882a80460995ab9b2
parent 19856bcb2e31ebd0a23392dd38b10bd344fdbd5a
parent a78bbda4e22afa3109fafa64663ea2aa7d562c72
author Connor O'Brien <connoro@google.com> 1485318133 +0000
committer android-build-merger <android-build-merger@google.com> 1485318133 +0000

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

Change-Id: Ia6a0eca88a49dc53d9cff27fb4f34c912530bc21