tree 99f0d895609c3f47404444b882a80460995ab9b2
parent 6b26798b3a5061e460c1180880e4023298791fbb
parent 445f24f712afe3ec7ae3398faeb96f42d5fe9c90
author Connor O'Brien <connoro@google.com> 1485318314 +0000
committer android-build-merger <android-build-merger@google.com> 1485318314 +0000

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

Change-Id: I97379a407b4c146f07c2bc44951dd903a0e4e4cc