diff options
| author | Alistair Delva <adelva@google.com> | 2021-03-05 23:49:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-05 23:49:21 +0000 |
| commit | 3f3fc93f2688427bfe12d90f8236e20e28f29e49 (patch) | |
| tree | 1418aa452ff3c020803ac1248aedd190ff7228ec /src/venus/vkr_ring.h | |
| parent | d85f0b2f71ab7caf78c3ad8f6a8c528a0a47eaa4 (diff) | |
| parent | 6ff9940a7463feb3c3f4e4a21e6c84ae4961f9ec (diff) | |
| download | virglrenderer-3f3fc93f2688427bfe12d90f8236e20e28f29e49.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into master am: a0994de9ca am: e2d45bd078 am: 06edf3d045 am: 6ff9940a74android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-release
Original change: https://android-review.googlesource.com/c/platform/external/virglrenderer/+/1621572
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7eedb466c64f654ca32077f7c5406a5b0356e367
Diffstat (limited to 'src/venus/vkr_ring.h')
0 files changed, 0 insertions, 0 deletions