summaryrefslogtreecommitdiff
path: root/vulkan/libvulkan/api.cpp
diff options
context:
space:
mode:
author Ana Krulec <akrulec@google.com> 2019-09-04 12:04:44 -0700
committer android-build-merger <android-build-merger@google.com> 2019-09-04 12:04:44 -0700
commit26b1e7478da5a11cfe24891ddeaf652ba413f463 (patch)
treed6e1fb07d507ed863fdee1c90e8770646778e1fb /vulkan/libvulkan/api.cpp
parent0d8e7db6b437e541a77ca7c1315fc24f5aaf48b9 (diff)
parent3264ef9aa27b4556b4f22c56295b1935868b974e (diff)
[automerger skipped] Merge changes from topic "b:140112642:4" into qt-surfaceflinger-dev
am: 3264ef9aa2 -s ours am skip reason: change_id I72d8cd48b3ec900989afcf0fab1cdc3046b87274 with SHA1 ad083c40b7 is in history Change-Id: I34425e7e74a815de9dc5992054efb007769363e6
Diffstat (limited to 'vulkan/libvulkan/api.cpp')
0 files changed, 0 insertions, 0 deletions