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

Change-Id: Ia685a237ee165ef19ceb70b1ebb8059064b6c0d3


Trivial merge