Merge "Check for EXT_color_buffer_float in read_pixels_fbo_format_mismatch" into...
authorTina Zhou <tinazh@google.com>
Wed, 19 Oct 2016 19:17:58 +0000 (19:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Oct 2016 19:17:58 +0000 (19:17 +0000)
am: 05e378a71d

Change-Id: If3ac25e64dcd16e9c5b03d3b1583c2e0dc3b796d


Trivial merge