Merge "Fix eglBindAPI negative test am: 09784f8510 am: 3342150f5a am: 1af587d644...
authorNicolas Boichat <drinkcat@google.com>
Tue, 22 Aug 2017 20:01:21 +0000 (20:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:01:21 +0000 (20:01 +0000)
am: 699fa6ce88

Change-Id: Iea7748eb5d30a9d3c85ca76ea9fd4d49cbd451eb


Trivial merge