tree c17efcaa360d92adc3b86d9436f5d56980e93d3d
parent 64c13460b2d6da4301f38d638e11863c5b107801
parent c40793619b2955bbcba4f22bb50daf9917dd9399
author David Zeuthen <zeuthen@google.com> 1495056216 +0000
committer android-build-merger <android-build-merger@google.com> 1495056216 +0000

Merge "adb: Allow disabling verity on eng builds when using AVB." am: 7ce0f00c08 am: c40793619b
am: 984757365f

Change-Id: I6479a768c3d6308452f9fa837a3b9917b91fd09e