tree fe0efc4d0ab688f15a8d3e0acae1c7ac9db5e165
parent a7e7dcbf080838041aaf1f43e55b4928e9b477f5
parent ba02b8832185d7d670a3083113ebe6c6eb9c85b3
author Cody Northrop <cnorthrop@google.com> 1531247624 -0700
committer android-build-merger <android-build-merger@google.com> 1531247624 -0700

Merge remote-tracking branch 'aosp/refs/heads/upstream-master' into 20180709-merge-vulkan_headers_to_master
am: ba02b88321

Change-Id: I59bbcc6c0bd3ba732839d76a7e06c3b735a18d2c