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