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

Change-Id: I1f0093e12f40b5e0e694b28833c815ea14174fa2


Trivial merge