| commit | f2b7441c88a5cb7a9240ee55ee6c9d72e3822925 | [log] [tgz] |
|---|---|---|
| author | John Stultz <john.stultz@linaro.org> | Thu Nov 05 17:51:46 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 05 17:51:46 2020 +0000 |
| tree | 514de253f25c3f7893ca7bcecfbc5b11bf147c3a | |
| parent | 8288108b6db1781b0af88015c3f7dee302832475 [diff] | |
| parent | 42ac17f8bf440fe56cbd7dc052182d511ee77920 [diff] |
Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: c707da598c am: 713247a272 am: b13b51996b am: 42ac17f8bf Original change: https://android-review.googlesource.com/c/platform/external/drm_hwcomposer/+/1485140 Change-Id: Id8cc6673022e9a990dd6aa46d4117ab7032f93a9