| commit | b13b51996b42f126d5c6415380d4718b1455c3de | [log] [tgz] |
|---|---|---|
| author | John Stultz <john.stultz@linaro.org> | Thu Nov 05 17:20:49 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 05 17:20:49 2020 +0000 |
| tree | 514de253f25c3f7893ca7bcecfbc5b11bf147c3a | |
| parent | 709de7f5f7f0c7724588798f5ca24882b22c2f6b [diff] | |
| parent | 713247a2723f1a624e47b791141034281b313298 [diff] |
Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: c707da598c am: 713247a272 Original change: https://android-review.googlesource.com/c/platform/external/drm_hwcomposer/+/1485140 Change-Id: I5a29c530aecb3eaa908e7d43e1ef6b2a6e0f5aba