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

Change-Id: I0e7fc2f94781ce5e81a90a1ba89aa3a9bf89e272


Trivial merge