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

Change-Id: Ie56ee078d19e99c4d66776af75d2b2b9e3504572


Trivial merge