tree a5225cfa2cac2878d0ad582c0f576d61d0fb75bc
parent f7d1ebeb4ccb1ff638b006eb0f9b0512081a7af4
parent c4b6f87f7ab969be7ee177baa8704774869ecb56
author Tao Bao <tbao@google.com> 1435901811 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435901811 +0000

am c4b6f87f: am 7125f959: Revert "Zero blocks before BLKDISCARD"

* commit 'c4b6f87f7ab969be7ee177baa8704774869ecb56':
  Revert "Zero blocks before BLKDISCARD"