Merge "Avoid thread state races in EGL multithread tests"
authorMichael Chock <mchock@nvidia.com>
Tue, 22 Aug 2017 18:32:44 +0000 (18:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:32:44 +0000 (18:32 +0000)
am: 5a0d512e5b

Change-Id: I775814f0bfe3cad21a3cada9c017d08e5a2aa739


Trivial merge