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