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

Change-Id: If4d79f8f18146afb9af62666b2a00ce40a6d04fc


Trivial merge