tree 65237ca8c8583486b6bb5582eeba71e1509294c8
parent 9bedd1a003945ec9cb1f1c8e3278588c7e7570b8
parent 1afd591a09cee35d0cafac3c1d7f236fe28cf274
author Jeremy Compostella <jeremy.compostella@intel.com> 1464052776 +0000
committer android-build-merger <android-build-merger@google.com> 1464052776 +0000

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

* commit '1afd591a09cee35d0cafac3c1d7f236fe28cf274':
  slot_metadata: add verity_corrupted field

Change-Id: Ic61d0514a8f224f35fe172b1056c6adb8bbc253c