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

Change-Id: I396e7cb648f5b4ca839e9c2a7f37ebb7fece47be


Trivial merge