Merge "Fix eglBindAPI negative test am: 09784f8510 am: b7b2f00530 am: 03a8c9c6f8...
authorNicolas Boichat <drinkcat@google.com>
Tue, 22 Aug 2017 19:35:08 +0000 (19:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 19:35:08 +0000 (19:35 +0000)
am: b97d297f67

Change-Id: I3ff24480bd2fcaa41678a6c6cf3eb2eb43e97e71


Trivial merge