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

Change-Id: I66748716e20fea93d29cbb114ed7301908657f16


Trivial merge