| commit | 69da7879e9d7e5fdec3215be7938626624956b47 | [log] [tgz] |
|---|---|---|
| author | John Stultz <john.stultz@linaro.org> | Fri Oct 09 17:32:41 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 09 17:32:41 2020 +0000 |
| tree | cd680faf5b186c330fd86f76bf2179d8e3afb1ad | |
| parent | 5435cde9c42416639dc6bcae8e17ec1d2dfae06e [diff] | |
| parent | 709de7f5f7f0c7724588798f5ca24882b22c2f6b [diff] |
Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: 8e7afb9d2e am: 30a066b586 am: 709de7f5f7 Original change: https://android-review.googlesource.com/c/platform/external/drm_hwcomposer/+/1443444 Change-Id: Ic5cb22dc78c3ad757e78ba531b0fab77da500839