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