commit | 343b2497ae38f5af77ad257cc7c728b835d187c2 | [log] [tgz] |
---|---|---|
author | John Stultz <john.stultz@linaro.org> | Wed Aug 22 10:51:33 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Aug 22 10:51:33 2018 -0700 |
tree | 1b6292c6762e8d96086aec2b7fcf18a3da14bf2b | |
parent | 7cb8f3dc8dbbeebb3cc5cde8c47821f9a463bd99 [diff] | |
parent | 16a155788d519eb55ee752c8fb54f9ef0c609883 [diff] |
Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into HEAD am: d0905e0b2c am: 16a155788d Change-Id: I0c1194bf0dfd09e556d0c4050f44b1df0eb03bae