summaryrefslogtreecommitdiff
path: root/vulkan/libvulkan/api.cpp
diff options
context:
space:
mode:
author Martin Stjernholm <mast@google.com> 2019-09-03 15:36:57 -0700
committer android-build-merger <android-build-merger@google.com> 2019-09-03 15:36:57 -0700
commitd94d56e3a758bfc25a60ec56e9605d5e9d398f35 (patch)
tree49612860db51f84994eb4dabb2d6fba0413b1252 /vulkan/libvulkan/api.cpp
parent32f13dbcf6545fc0287b22fa3c0a74522f7857c9 (diff)
parentbf99815ae40a0b415527c9a29549926d6a6f2a52 (diff)
[automerger skipped] Merge "Merge "Update identifiers and paths to the new ART APEX." am: 0bc2361309 am: 638c078565 am: cae978e2f7 am: cf2576a56b" into qt-qpr1-dev-plus-aosp
am: bf99815ae4 -s ours am skip reason: change_id I11000a8cc95085bb0144f858b4f3968e5aceac36 with SHA1 ef582cd242 is in history Change-Id: I87001e6073fe45a62f4a5740d3a43b133b3f0da0
Diffstat (limited to 'vulkan/libvulkan/api.cpp')
0 files changed, 0 insertions, 0 deletions