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

Change-Id: I3d99a87b5ded7884ba1549dae9f82498ce3c2c6f


Trivial merge