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

Change-Id: I6830683be5c3f71a47c61202689daa9a98797632


Trivial merge