Merge "Fix eglBindAPI negative test am: 09784f8510 am: b7b2f00530 am: 03a8c9c6f8...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 20 Jan 2017 18:50:49 +0000 (18:50 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 20 Jan 2017 18:50:50 +0000 (18:50 +0000)

Trivial merge