tree 14c8ea31b7515d0eb02093bb1fb006fb48cd9f29
parent b211c8cf0994992f521f3406c3a173f64bf4fe0a
parent da724f7a630abc122f8eae042264ee81cf1450c4
author Tao Bao <tbao@google.com> 1436562114 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436562114 +0000

am da724f7a: Merge "Zero out blocks that may be touched by dm-verity."

* commit 'da724f7a630abc122f8eae042264ee81cf1450c4':
  Zero out blocks that may be touched by dm-verity.