tree e49292284b5bc17246927451170287c7d0c728b4
parent 44fb46099355c1052d207dba085215191b68bae3
parent d611cb9b25276ac4650b1aaf9ee0155f90164e8d
author John Stultz <john.stultz@linaro.org> 1545372032 -0800
committer android-build-merger <android-build-merger@google.com> 1545372032 -0800

Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into HEAD am: 5d32321b0b
am: d611cb9b25

Change-Id: Ib9527e947d8d199958f128f71c4f77bcc3f0d86c