tree d8e2db6df2b5f0f3043f70442cd60751af423489
parent 059e391f9eac7fd2d152da79fbfac9b0bb5a2fad
parent 280cb6e90c3379072d7677101564b23dfb70182c
author Sami Tolvanen <samitolvanen@google.com> 1433960516 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433960516 +0000

am 280cb6e9: Merge "Zero blocks before BLKDISCARD"

* commit '280cb6e90c3379072d7677101564b23dfb70182c':
  Zero blocks before BLKDISCARD