| commit | 3f3fc93f2688427bfe12d90f8236e20e28f29e49 | [log] [tgz] |
|---|---|---|
| author | Alistair Delva <adelva@google.com> | Fri Mar 05 23:49:21 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 05 23:49:21 2021 +0000 |
| tree | 1418aa452ff3c020803ac1248aedd190ff7228ec | |
| parent | d85f0b2f71ab7caf78c3ad8f6a8c528a0a47eaa4 [diff] | |
| parent | 6ff9940a7463feb3c3f4e4a21e6c84ae4961f9ec [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into master am: a0994de9ca am: e2d45bd078 am: 06edf3d045 am: 6ff9940a74 Original change: https://android-review.googlesource.com/c/platform/external/virglrenderer/+/1621572 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7eedb466c64f654ca32077f7c5406a5b0356e367