Merge "Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 19:50:04 +0000 (19:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 19:50:04 +0000 (19:50 +0000)
am: 89918ce31e  -s ours

Change-Id: Ice68b82590b0fa1d5978f9884a2f163e12ec7b64


Trivial merge