tree fcfc300d139ccddd9de4219453358f39e9f5e9b2
parent 915fc970d1a5181496f846cd8673716966ddf6fb
parent a1009c346827c89f35d4feb011d01dd18de1b134
author Elliott Hughes <enh@google.com> 1433971725 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433971725 +0000

am a1009c34: Merge "Split WipeData into PreWipeData and PostWipeData."

* commit 'a1009c346827c89f35d4feb011d01dd18de1b134':
  Split WipeData into PreWipeData and PostWipeData.