summaryrefslogtreecommitdiff
path: root/vulkan/libvulkan/api.cpp
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2019-09-11 14:51:10 -0700
committer android-build-merger <android-build-merger@google.com> 2019-09-11 14:51:10 -0700
commitabecbc21cb47f7a01e5b48aa4c647d06a988bd9a (patch)
treea7ea78dd9b860be687fc35eba1beff2679c124e7 /vulkan/libvulkan/api.cpp
parentd17dd5ed07323ac441ab0fb369854326358439cb (diff)
parent90f393c579a538f36844bc770b5ab77b11ec957e (diff)
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 76cc73e91c -s ours
am: 90f393c579 -s ours am skip reason: change_id Ied9a812f235e2a5146381b0ac8c602db1c6035f5 with SHA1 b9a4f9efdd is in history Change-Id: Ie7e52ed7f8d0c05a6f4045c6bb20f2bf92f41326
Diffstat (limited to 'vulkan/libvulkan/api.cpp')
0 files changed, 0 insertions, 0 deletions