Merge "Fix eglBindAPI negative test" into nougat-cts-dev am: 6068dfbf3a am: 839be6fae...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 19:36:41 +0000 (19:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 19:36:41 +0000 (19:36 +0000)
am: f8fb7786bc

Change-Id: Ie00598aa092d1e0c24823f3b1cd39c21bb981fe5


Trivial merge