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

Change-Id: Icb23e3126e0ecf4c8cc9740e6c7843549b649ffc


Trivial merge