tree 10ab1e7f41fa162c3d385c62dbcdc338546039fe
parent fe092cbce903b6d628f1b159f4c55948f381e796
parent 43310c6c1b2e933fc49aafd9bf986c74df4ea286
author Alistair Strachan <astrachan@google.com> 1533749094 -0700
committer android-build-merger <android-build-merger@google.com> 1533749094 -0700

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

Change-Id: I652caf38a4a3f78b9a5a13ef568fd8c72a0f38ad