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

Change-Id: I73cff9b7c4b40fb5dcd58c0d330a310da7194f68


Trivial merge