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:55:24 +0000 (18:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 18:55:24 +0000 (18:55 +0000)
am: 47953075f3  -s ours

Change-Id: Id9de074397751103f0e6603acf9bc00a59f3809c


Trivial merge