Merge "Fix eglBindAPI negative test am: 09784f8510 am: b7b2f00530 am: 03a8c9c6f8...
authorNicolas Boichat <drinkcat@google.com>
Fri, 20 Jan 2017 19:00:22 +0000 (19:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 19:00:22 +0000 (19:00 +0000)
commitb97d297f6702bd2554a0e4cef61c7e5f6ddaef0b
tree74bdcc363814cf680b5393f994270c2641ea050c
parent0d83404b483b227ee20e691bd0c816cc0cbdb873
parent7090e0d7c3aa12904eaae75ad9b96f8ec52d8a5b
Merge "Fix eglBindAPI negative test am: 09784f8510 am: b7b2f00530 am: 03a8c9c6f8 am: 6e6f163b3b am: 3401c85689" into nyc-mr2-dev-plus-aosp
am: 7090e0d7c3

Change-Id: I83661ea162842ee4a2652540744fd96927679970