tree a93052fb13c17955e033634f8b0d832982b7d9b2
parent a7915380bb2fcff29a58eff59b5465af77ea29d9
parent b6684d327f6e1c1b8c05f2ca57283063cfc3f38b
author Connor O'Brien <connoro@google.com> 1485318489 +0000
committer android-build-merger <android-build-merger@google.com> 1485318489 +0000

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

Change-Id: I02ff6a6d8c01360cedbb14e62e78b73cc885005f