| commit | 2c43892b3f55d482aae7532b7aa14918f03df724 | [log] [tgz] |
|---|---|---|
| author | John Stultz <john.stultz@linaro.org> | Mon Jul 06 23:16:19 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 06 23:16:19 2020 +0000 |
| tree | 87fd110c6b34be915ee87f22883197b366fe95dc | |
| parent | 696cb269cb619021cba681111f7334f1c0dd490a [diff] | |
| parent | 37b57553a14517b4be01ea98ff9a165e2d05214f [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: 37b57553a1 Original change: https://android-review.googlesource.com/c/platform/external/drm_hwcomposer/+/1355362 Change-Id: Ie6697ec47a734ea5599d17a4c41588ee58d9acd5