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

Change-Id: I4173b532f1df3d9a4dbc26331551c8da015e8193


Trivial merge