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

Change-Id: Ic956c9c223aef327c2614b3f52ecf5c1166bec22


Trivial merge