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

Change-Id: Icc099ddabc2fff2ec6fa52e4f251ef0bed494b24


Trivial merge