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:35:22 +0000 (18:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 18:35:22 +0000 (18:35 +0000)
am: 306e8af13e  -s ours

Change-Id: Ic85553551174fa4c8604b704b1030596351d7c90


Trivial merge