tree 10ab1e7f41fa162c3d385c62dbcdc338546039fe
parent 5fecf2846581f4d795ed13ef10876f2922aeda41
parent 72ef1bb61148c9a9fde97328c3df0dbabfc59e78
author Alistair Strachan <astrachan@google.com> 1533748807 -0700
committer android-build-merger <android-build-merger@google.com> 1533748807 -0700

Merge "hikey{,960}: Enable system-as-root and verity."
am: 72ef1bb611

Change-Id: Id065e6377d132e51f4a3cfd0d8ddda4ccab4d699