tree 2dfb0dec13b9285f209d32e7f6d7a1436743c0cc
parent 17b2afc1f33baf482820cc191ef2a391150dd92c
parent 9e1bba1f5f53f366bfec995a89e362c3b897cb37
author Tao Bao <tbao@google.com> 1427824049 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427824049 +0000

am 9e1bba1f: am 9295980a: Merge "Revert "Erase PST partition if its marked to be erased.""

* commit '9e1bba1f5f53f366bfec995a89e362c3b897cb37':
  Revert "Erase PST partition if its marked to be erased."