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

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

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