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

Change-Id: I34ed89f179b782eb84697be5f5e6e1b60b8781be


Trivial merge