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

Change-Id: I27bed7cc5a3ca1daebc6ae10d9a936ff55da3427


Trivial merge