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

Change-Id: Ic1e629d36bd039fe619e5715af0991dc0e3824e5


Trivial merge