tree d0d9016d937d15593abbf924eed67ae60a3476c8
parent 24161822968bf1523f5611010187330e9eccbd6f
parent 71fd102070e6d3e708c34e666df2dc520eaa26d8
author Dmitry Shmidt <dimitrysh@google.com> 1501344019 +0000
committer android-build-merger <android-build-merger@google.com> 1501344019 +0000

Merge "hikey960: Prepare for multikernel use" am: 946f30a27c am: 675a146f1c
am: 71fd102070

Change-Id: I65534e8123199ba72c6e2d50116eafce110e6b81