| commit | 921998c069ab90b15f92986547ba916dc009b95c | [log] [tgz] |
|---|---|---|
| author | Jason Macnak <natsu@google.com> | Thu Sep 30 19:05:06 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 30 19:05:06 2021 +0000 |
| tree | b379ff5a7191af242de01a1a3fa176c837d42ad6 | |
| parent | 037e04e4e35efd2cc45dad00bdfdfd1ab9ea7e54 [diff] | |
| parent | 275ddc7b15bd0fc2500f4c8516f691c94070756d [diff] |
Merge remote-tracking branch 'aosp/upstream-main' into 'aosp/master' am: e300b83aaa am: ad0a6c1ef3 am: db04a5e50e am: 275ddc7b15 Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/1838093 Change-Id: I1f0d3fff4c3858562be9e9475d55b0fdd0a8e424