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