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

Change-Id: I040b02b1b9e3a62157dc5574be6d6b574a214fb2


Trivial merge