Merge "Merge "Fix eglBindAPI negative test" into nougat-cts-dev am: 6068dfbf3a am...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 20:55:00 +0000 (20:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 20:55:00 +0000 (20:55 +0000)
am: 1a22842512

Change-Id: Ia0224916079992f0bdac6e93c30343da867d89d5


Trivial merge