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