diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-23 22:29:15 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-23 22:29:15 +0000 |
commit | d85f0b2f71ab7caf78c3ad8f6a8c528a0a47eaa4 (patch) | |
tree | 7fb815712954c8e207872f9942fa42d18c441b5b /src/venus/vkr_ring.h | |
parent | 61aa918f6ef2a71ade19969f10fdf113cd9c703e (diff) | |
parent | a0d14ecfcac1e000b43ef57c9cb137a7bc9d56f2 (diff) | |
download | virglrenderer-d85f0b2f71ab7caf78c3ad8f6a8c528a0a47eaa4.tar.gz |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into HEAD" am: c930cbc00c am: af3d1de900 am: d323574586 am: a0d14ecfca
Original change: https://android-review.googlesource.com/c/platform/external/virglrenderer/+/1546374
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3cf6f280ce02e521a6c0a3df9a10d507db4ea975
Diffstat (limited to 'src/venus/vkr_ring.h')
0 files changed, 0 insertions, 0 deletions