| commit | 3598c2e2a2f837d9e577455c9e6cdb33972446e2 | [log] [tgz] |
|---|---|---|
| author | Jason Macnak <natsu@google.com> | Tue Sep 08 17:00:10 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 08 17:00:10 2020 +0000 |
| tree | 407f05ed314440f47f459e47b4adbb4c205154e6 | |
| parent | c7ecb443d4872abf22bdb5717b6c9c07e6610863 [diff] | |
| parent | 2b534bc2552dbd36583c3fdc011e3858aa6a1ebb [diff] |
Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: 42de64e56d am: 58a4d1f46b am: 2b534bc255 Original change: https://android-review.googlesource.com/c/platform/external/drm_hwcomposer/+/1419031 Change-Id: I00b9e1562443f949e6f7ca285c5d3dc0f0239be4