Merge "Check for EXT_color_buffer_float in read_pixels_fbo_format_mismatch" into...
authorTina Zhou <tinazh@google.com>
Wed, 19 Oct 2016 16:03:30 +0000 (16:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Oct 2016 16:03:30 +0000 (16:03 +0000)
am: 544e0e3b1d

Change-Id: I439ee038030d31d881b960e18e74c90ad5aaa715


Trivial merge