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

Change-Id: Ieb884c16b84c8e7d9baf9d31b338cda37f853c6e


Trivial merge