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

Change-Id: I534675ef9f033f5b45a00e4e3c78c3b97cd6a400


Trivial merge