commit | f8dd4544a42c88918da2349b491650b0cc427b50 | [log] [tgz] |
---|---|---|
author | John Stultz <john.stultz@linaro.org> | Mon Nov 08 21:51:05 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 08 21:51:05 2021 +0000 |
tree | 5922dbd3c47d187720fe08e978bcc536970e3ae5 | |
parent | c48949c14bb3a5c748743b526d890bdb50bc3a7d [diff] | |
parent | b038ca0b70a8c3a659aa12be8211bdb3de040d94 [diff] |
Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: 97b4f2559e am: 6e792d7aa5 am: fc030f53a5 am: b038ca0b70 Original change: https://android-review.googlesource.com/c/platform/external/drm_hwcomposer/+/1883310 Change-Id: I158aeece6bbfc33e681f5b8f1fa7df05d11e4c1a