commit | 713247a2723f1a624e47b791141034281b313298 | [log] [tgz] |
---|---|---|
author | John Stultz <john.stultz@linaro.org> | Thu Nov 05 17:06:09 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 05 17:06:09 2020 +0000 |
tree | 514de253f25c3f7893ca7bcecfbc5b11bf147c3a | |
parent | 30a066b5861d2e057a60edce8f564a84e5af6a62 [diff] | |
parent | c707da598cb2d7ad50c19021eba1d130241747c2 [diff] |
Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: c707da598c Original change: https://android-review.googlesource.com/c/platform/external/drm_hwcomposer/+/1485140 Change-Id: Ie6cff7b500fe023f0543bde86d4f3ffec9954727