tree cd96510bda79813136380d688145acb668a95824
parent 08244e33149eacfbeee382aa02a17940fc5abfce
parent a1e5dccd6adf4509868368f57e2df956dff880df
author John Stultz <john.stultz@linaro.org> 1534953982 -0700
committer android-build-merger <android-build-merger@google.com> 1534953982 -0700

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

Change-Id: If56e54850f1dff9679e7ac0942dad88c7f43d70e