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

Change-Id: I620b5ed1b7ca9f78efc4068fad69b06f59f7c354


Trivial merge