tree a8ad26bb6d3b9ae03681db9a346201bf76d84c18
parent 93c4b6c85ac4350029e1a78c16663f61c777ac14
parent b6b66f8fde39ce004fa9db5d9f88f21a2b7bedd0
author Sami Tolvanen <samitolvanen@google.com> 1428399752 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428399752 +0000

am b6b66f8f: am 02f1d80a: Merge "Restore verity state when verified partition is reflashed"

* commit 'b6b66f8fde39ce004fa9db5d9f88f21a2b7bedd0':
  Restore verity state when verified partition is reflashed