Merge remote-tracking branch 'aosp/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Thu, 15 Feb 2018 00:25:39 +0000 (16:25 -0800)
committerChris Forbes <chrisforbes@google.com>
Thu, 15 Feb 2018 00:25:39 +0000 (16:25 -0800)
commitd123162e1c29c37a78d481c906d8107b7b1696dd
treeb48c2ae01d01e15bdc22301095e5551d9804ec77
parent42ab744cbe66759903cdbe8cb8ffce120e1cf14b
parent0b5bb4a854a15c5a8269b06e94c40922478e8a43
Merge remote-tracking branch 'aosp/master' into deqp-dev

Change-Id: Iee4ea748158c78112727bf21b905432b62b4fca9
android/cts/master/egl-master.txt
modules/egl/teglWideColorTests.cpp