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

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

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