tree 1b6292c6762e8d96086aec2b7fcf18a3da14bf2b
parent a113587ef1eba0fc7e3fff24fe1a891b2619aa62
parent 343b2497ae38f5af77ad257cc7c728b835d187c2
author John Stultz <john.stultz@linaro.org> 1534963423 -0700
committer android-build-merger <android-build-merger@google.com> 1534963423 -0700

Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into HEAD am: d0905e0b2c am: 16a155788d
am: 343b2497ae

Change-Id: Ib61a378684e8a15b353411e7f62a059b206368b4