Merge remote-tracking branch 'aosp/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Fri, 28 Sep 2018 00:25:23 +0000 (17:25 -0700)
committerChris Forbes <chrisforbes@google.com>
Fri, 28 Sep 2018 00:25:23 +0000 (17:25 -0700)
commit90741a7a1d8fa4d52236364e51c7a6395b8f3b1d
tree3e4b74b29ed6e82c89f6959157c463e18ca936fd
parent0236dfe58525be5b4b857b947271e5d442dbdf49
parent92157740ab6cfae9a67b35d7ab18190de2fb62e7
Merge remote-tracking branch 'aosp/master' into deqp-dev

Change-Id: I777f742d2c5fe3559350b0e0ae045af688389730
android/cts/master/gles2-master.txt
android/cts/master/gles3-master.txt
android/cts/master/vk-master.txt
framework/referencerenderer/rrFragmentOperations.cpp