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