diff options
| author | 2020-12-09 20:21:56 +0000 | |
|---|---|---|
| committer | 2020-12-09 20:21:56 +0000 | |
| commit | 338022f3f78fc4ecb4f1f680bd5ca1e969821809 (patch) | |
| tree | 27b51dbe6a75c14b37db53b2f09aaf66730b6c5c /vulkan/libvulkan/api.cpp | |
| parent | 000700590a1c14e3dba970cca7ae36c4cd1605a4 (diff) | |
| parent | 60f3ab275ef3ddf3afcdfdce4eb09b59024fec51 (diff) | |
resolve merge conflicts of cae2ee036040fc0dce9fc82af9bf8d85240d566b to rvc-dev am: 60f3ab275e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/13186612
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I065dc674678b9218920def3e7b347a1580fbd7de
Diffstat (limited to 'vulkan/libvulkan/api.cpp')
0 files changed, 0 insertions, 0 deletions