tree cc62dfe270c6a3ef015f2be0c02cf88360e25fbe
parent 482d722f5beca025b72a9efa8e327ce39ce0a0c0
parent bd56ab163a4afd6dd02c042206ad1abc721f54dc
author Paul Crowley <paulcrowley@google.com> 1524625385 -0700
committer android-build-merger <android-build-merger@google.com> 1524625385 -0700

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

Change-Id: I76d9b121644deb382dca26906e98768f982b31d6