tree 5a72c44e196d110faa67a127da1364f89a43b612
parent 79c13cee260ebca72752439353fa739aa6f3230f
parent f5e2831bf32fe1c0069c3c7bbeda876dbb83fe0a
author Jeremy Compostella <jeremy.compostella@intel.com> 1464052621 +0000
committer android-build-merger <android-build-merger@google.com> 1464052621 +0000

Merge "slot_metadata: add verity_corrupted field" am: 3788001b2c am: 1ae2434c11
am: f5e2831bf3

* commit 'f5e2831bf32fe1c0069c3c7bbeda876dbb83fe0a':
  slot_metadata: add verity_corrupted field

Change-Id: I3a2c24a80e53a28fa7b56c64df5fc10ee7414f24