tree 0cffe38491f500d4d1c8ddb03c4c77733d50c462
parent 87363d0f897c354559bf4615c3788ae34d6e31cd
parent b266fbab195bb8376c85cd1717a1a1376c8e6bb4
author David Zeuthen <zeuthen@google.com> 1502220125 +0000
committer android-build-merger <android-build-merger@google.com> 1502220125 +0000

Merge "update_verifier: Support androidboot.veritymode being empty or 'disabled'." am: 399ce66534 am: bb8d04cd3c am: f2a8eba23c am: ade231287b
am: b266fbab19

Change-Id: I76e3c13de59217baa9ef2eb4c3b37abf3f23196b