Merge "Fix eglBindAPI negative test" into nougat-cts-dev am: 6068dfbf3a am: 365f81e68...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 20:42:18 +0000 (20:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 20:42:18 +0000 (20:42 +0000)
am: 930d6894e5

Change-Id: I8d8b61c5fbbc9bdbd13a6099508b5550ff469bb5


Trivial merge