Merge "Merge "Fix eglBindAPI negative test" into nougat-cts-dev am: 6068dfbf3a am...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 19:37:07 +0000 (19:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 19:37:07 +0000 (19:37 +0000)
am: 61aec40a6f

Change-Id: I53c3e2341f5290eede05bf714f84f0e95a420cc1


Trivial merge