tree d8e2db6df2b5f0f3043f70442cd60751af423489
parent 11cad65d2a2b829d5bae02589c6f1d167cf4e53f
parent 915fc970d1a5181496f846cd8673716966ddf6fb
author Sami Tolvanen <samitolvanen@google.com> 1433968611 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433968611 +0000

am 915fc970: am 280cb6e9: Merge "Zero blocks before BLKDISCARD"

* commit '915fc970d1a5181496f846cd8673716966ddf6fb':
  Zero blocks before BLKDISCARD