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

Change-Id: I42d70e2e5775742c0c781d833b2bc08867f70318


Trivial merge