Merge "Merge "Fix eglBindAPI negative test" into nougat-cts-dev am: 6068dfbf3a am...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 19:01:10 +0000 (19:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 19:01:10 +0000 (19:01 +0000)
am: 49a8b52d3a

Change-Id: I9c12ef1e40dc853dc828166a3733fd48a9a9bf27


Trivial merge