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:25:13 +0000 (19:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 19:25:13 +0000 (19:25 +0000)
am: 0dd94f2847  -s ours

Change-Id: I48ed5b0042149e0b4b2181b129a7b07ada5bf1a5


Trivial merge