tree 097fa88bcdb10c041db052a339c97ecfc9e6d063
parent b32e439d04ba408a34dcc7b96bfa9a395fed1e34
parent 79e95b2d167becd93e7c456e5aa0c482edaeefcc
author Tao Bao <tbao@google.com> 1436648317 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436648317 +0000

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

* commit '79e95b2d167becd93e7c456e5aa0c482edaeefcc':
  Revert "Zero blocks before BLKDISCARD"