tree a5225cfa2cac2878d0ad582c0f576d61d0fb75bc
parent 2b3c599c6a6b7c2cf8da3e6ad9ada5812df3f831
parent 7125f9594db027ce4313d940ce2cafac67ae8c31
author Tao Bao <tbao@google.com> 1435777379 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435777379 +0000

am 7125f959: Revert "Zero blocks before BLKDISCARD"

* commit '7125f9594db027ce4313d940ce2cafac67ae8c31':
  Revert "Zero blocks before BLKDISCARD"