| commit | 48eaaa48138e6598f9ed7dff293c4a2479a10a6e | [log] [tgz] |
|---|---|---|
| author | John Stultz <john.stultz@linaro.org> | Tue Jul 07 00:09:41 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 07 00:09:41 2020 +0000 |
| tree | 87fd110c6b34be915ee87f22883197b366fe95dc | |
| parent | 6113fdb38115ebb1b1c6bcf2844901eabb91a751 [diff] | |
| parent | c7ecb443d4872abf22bdb5717b6c9c07e6610863 [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: 37b57553a1 am: 2c43892b3f am: f170f9360c am: c7ecb443d4 Original change: https://android-review.googlesource.com/c/platform/external/drm_hwcomposer/+/1355362 Change-Id: I71c7cc9d1adbdeec96f6abccd9512c189c06f46a