tree cc62dfe270c6a3ef015f2be0c02cf88360e25fbe
parent 4388c792422264660fab5e28d0e5216989674abd
parent 62fd21b9bbf9e4b5622fe250c3dc34d40fc20346
author Paul Crowley <paulcrowley@google.com> 1524624883 -0700
committer android-build-merger <android-build-merger@google.com> 1524624883 -0700

Merge "Wipe the metadata partition when we wipe data." am: 897385bfe2
am: 62fd21b9bb

Change-Id: I338d7882e63abe9e78c2566b32c0fe28e2272614