Merge "Merge "Fix eglBindAPI negative test" into nougat-cts-dev am: 6068dfbf3a am...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 20 Jan 2017 18:51:10 +0000 (18:51 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 20 Jan 2017 18:51:10 +0000 (18:51 +0000)

Trivial merge