tree 6413d841ff16f908a34ac0910c40f78cdc2857ed
parent 5a95719bd9ac27d573388e6aa4b48715d9aa3d9e
parent c94fa0b01b43709531dfbcdb94abb2a1cc23be3d
author Andres Morales <anmorales@google.com> 1430069841 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430069841 +0000

am c94fa0b0: (-s ours) DO NOT MERGE Revert "Erase PST partition if its marked to be erased."

* commit 'c94fa0b01b43709531dfbcdb94abb2a1cc23be3d':
  DO NOT MERGE Revert "Erase PST partition if its marked to be erased."