| commit | f5cd75234b3be37fa9b1a8bf31cc5f6fdc58c2c9 | [log] [tgz] |
|---|---|---|
| author | Jason Macnak <natsu@google.com> | Wed Jan 26 20:16:07 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 26 20:16:07 2022 +0000 |
| tree | f76bfa060614336d3f355bec8d4321433403688e | |
| parent | fb30bcf225af16f208012a41bb4dbea2a3b201af [diff] | |
| parent | 5fb10fe25eb5ad5d01a09156051b0c88ea72d6a3 [diff] |
Merge remote-tracking branch 'aosp/upstream-main' into 'aosp/master' am: e6295d18ec am: 5fb10fe25e Original change: https://android-review.googlesource.com/c/platform/external/drm_hwcomposer/+/1960322 Change-Id: Ic953f2f210d8b0b28fad969957ad73122abf5e22