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

Change-Id: Ib0bb082d5c906b0b614387c2c7bfab5e5727b160


Trivial merge