tree fcfc300d139ccddd9de4219453358f39e9f5e9b2
parent 1e8bc40b02e372403ba58e4681952347bea3fb34
parent d7c9bf41daa865ca016dee12a68282ba457c31fb
author Sami Tolvanen <samitolvanen@google.com> 1433978252 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433978252 +0000

am d7c9bf41: Merge "Zero blocks before BLKDISCARD" into mnc-dev

* commit 'd7c9bf41daa865ca016dee12a68282ba457c31fb':
  Zero blocks before BLKDISCARD