tree 5999b4abeaa280a75a2b8eb67a301b3d1739bac2
parent 8754c36641eeb868a0669ee089aff189f75fbb7e
parent 9df159da877cad258dea99d7c2d24ced3797ff40
author Sami Tolvanen <samitolvanen@google.com> 1433887996 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433887996 +0000

am 9df159da: am 604c583c: Zero blocks before BLKDISCARD

* commit '9df159da877cad258dea99d7c2d24ced3797ff40':
  Zero blocks before BLKDISCARD