tree fcfc300d139ccddd9de4219453358f39e9f5e9b2
parent abb78773a7f30a1bcb2742834749574436a7862e
parent 12c8ea6827f2de5b4376524790dd9d2c9d6ef6ad
author Elliott Hughes <enh@google.com> 1433977080 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433977080 +0000

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

* commit '12c8ea6827f2de5b4376524790dd9d2c9d6ef6ad':
  Split WipeData into PreWipeData and PostWipeData.