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

Change-Id: I15e8699e526124806d63a299d9c5ce73fffd696f


Trivial merge