tree 8d4f8df3b8e6bc4ec6d1d25e101a55c44f908b80
parent d3f9e2efdd64552961dc21b8c899c9d797fa1ff9
parent 0df4f4eca50b6957b8bcdb0e87eb566fb72e4ed1
author Jesse Hall <jessehall@google.com> 1545258730 -0800
committer android-build-merger <android-build-merger@google.com> 1545258730 -0800

Merge changes from topic "vk-1.1.95" am: c306901bc5
am: 0df4f4eca5

Change-Id: I48b32056ddd2b4e445d161d383a8d448c94f455b