tree 097fa88bcdb10c041db052a339c97ecfc9e6d063
parent b6b31549dfe3c9ec6b32e2862ee7e08a949e2f9c
parent f2853e27472728d3a24293ab4bfc445c74be6a15
author Tao Bao <tbao@google.com> 1436647620 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436647620 +0000

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

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