Merge "Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 19:24:38 +0000 (19:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 19:24:38 +0000 (19:24 +0000)
am: ee29a031b3  -s ours

Change-Id: Ic24f61576cf5ca51ca9470fbea1693e4a6dd2d86


Trivial merge