tree 6413d841ff16f908a34ac0910c40f78cdc2857ed
parent 774f8f695a511f0893ba3d42465f14c14d27a7a3
parent 5c025ac5c84c19e4eac6ca6e9f5c2f51e09add54
author Andres Morales <anmorales@google.com> 1430148822 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430148822 +0000

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

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