Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 18:29:13 +0000 (18:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 18:29:13 +0000 (18:29 +0000)
commit306e8af13e6b0fff629016b6b8c135b01038ee56
treeef1889ce184fe3e5be3894162785d6d1a4f10fb9
parent509b577c430664d57e1b7246bc4215402b0d8eef
parent13a05434cc7677139ed9a6918d11d4f8dca327c5
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev
am: 13a05434cc  -s ours

Change-Id: Ib0bb082d5c906b0b614387c2c7bfab5e5727b160