Merge "Fix eglBindAPI negative test am: 09784f8510 am: 3342150f5a am: 1af587d644...
authorNicolas Boichat <drinkcat@google.com>
Fri, 20 Jan 2017 20:54:31 +0000 (20:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 20:54:31 +0000 (20:54 +0000)
am: f40c8d91c6

Change-Id: I36b39dbff29f9b1fd6fd6e6a2ee2c76a575025cd


Trivial merge