tree a01544b99af8c148b9f3d66b5542107624f48f1d
parent 4e6507f32817e2943b1f27d12f56b485993c2a44
parent 65c230f4b3c9fd6b42f6502b96e5b47c7b1c2f61
author Tao Bao <tbao@google.com> 1436646752 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436646752 +0000

am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD""

* commit '65c230f4b3c9fd6b42f6502b96e5b47c7b1c2f61':
  Revert "Zero blocks before BLKDISCARD"