diff options
| author | 2020-10-13 04:50:32 +0000 | |
|---|---|---|
| committer | 2020-10-13 04:50:32 +0000 | |
| commit | ed35f1265682c3fbe519072b7f06745f0d21f1f9 (patch) | |
| tree | 521333f703528dff150f8e7ccc1c146804aefe4a /vulkan/libvulkan/api.cpp | |
| parent | 74d374bad65dfd4b1f5f1d507393d9f74ad8f7de (diff) | |
| parent | 365497961b8e7150b8f44633bd5c546e28ce6cbf (diff) | |
[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 516068ee7e -s ours am: de2827438a -s ours am: 365497961b -s ours
am skip reason: Change-Id Iac158e7721f651cc0d041fd310d01808d549a4db with SHA-1 864d48037d is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/12804332
Change-Id: Iccee58ca53e0e5655956075a982da5582c97670b
Diffstat (limited to 'vulkan/libvulkan/api.cpp')
0 files changed, 0 insertions, 0 deletions