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

Change-Id: Ide30bf228e53857ea93ce7a91e4c2b10d8a845a0


Trivial merge