tree 031d407040f386c45bd09d5b02fecc603417c282
parent 0558051d3eebf3f67b27ecd43031a54251726643
parent d1d0203a850972556e9c0fd14038bd0a5f05e639
author Treehugger Robot <treehugger-gerrit@google.com> 1606520102 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606520102 +0000

Merge "hikey.mk/hikey960.mk: add support for android-mainline kernel" am: d90872832e am: d1d0203a85

Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1509788

Change-Id: Ib80e15efa3dc9fd93154a10ba89f6184e0cd18b4