tree 1b6292c6762e8d96086aec2b7fcf18a3da14bf2b
parent 7cb8f3dc8dbbeebb3cc5cde8c47821f9a463bd99
parent d0905e0b2cd935e61c3945ac179112f702fa866b
author John Stultz <john.stultz@linaro.org> 1534953966 -0700
committer android-build-merger <android-build-merger@google.com> 1534953966 -0700

Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into HEAD
am: d0905e0b2c

Change-Id: I41098d420d81a1747a17a3d2488fa8f1cf7d813f