tree 978484ffed1caece7fe1f9fd86b6274efba0f949
parent 3ec5173e930373f42a50350a6671ea76a224d1ab
parent 408a6fbd2e9a4b30b45e83e26e70294b30e1e35b
author Sami Tolvanen <samitolvanen@google.com> 1436986948 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436986948 +0000

am 6c3b205c: am 759717ee: Merge "Update partition.*.verified even with ro.boot.veritymode set"

* commit '6c3b205c408f92101ddfa053cb134371e951a9a7':
  Update partition.*.verified even with ro.boot.veritymode set