tree 46d64e674bd137408ae0cc04eb6ea74075af2050
parent 7baa13f6d6ffa77e35e3596018efa5ca9a1febf7
parent 69608fe7548727ee765c89f69a6861479f391487
author Sami Tolvanen <samitolvanen@google.com> 1433885326 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433885326 +0000

am 69608fe7: Merge "Zero blocks before BLKDISCARD"

* commit '69608fe7548727ee765c89f69a6861479f391487':
  Zero blocks before BLKDISCARD