commit | a2ef145276a58bad1b026793dcd8f3445574bd02 | [log] [tgz] |
---|---|---|
author | John Stultz <[email protected]> | Thu Dec 20 22:05:39 2018 -0800 |
committer | android-build-merger <[email protected]> | Thu Dec 20 22:05:39 2018 -0800 |
tree | e49292284b5bc17246927451170287c7d0c728b4 | |
parent | 64270ab3b147742803880393cef98e026bcdab92 [diff] | |
parent | dc8f79e73d48b3d9955d80136261a0e7b617a729 [diff] |
Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into HEAD am: 5d32321b0b am: d611cb9b25 am: dc8f79e73d Change-Id: I45efdd6ab987c2d7823a0ee6cb934521edbf6be3