Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am: 13a05434cc...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 18:44:24 +0000 (18:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 18:44:24 +0000 (18:44 +0000)
am: 24141a0482  -s ours

Change-Id: I13df84dda146ef5421308701446209fe6ba6db5c


Trivial merge