Merge "Use glReadnPixels only if KHR_robustness is supported am: d99ba132d9 am: d0198...
authorAlexander Galazin <alexander.galazin@arm.com>
Wed, 15 Mar 2017 15:47:12 +0000 (15:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 15 Mar 2017 15:47:12 +0000 (15:47 +0000)
commit49c0db9055cc0c10f614bcc8c28370806065982b
tree132d71ed7b59ec3f94903535fc760888c9d05ed8
parent29a6f6dab4fb18a1a764a588271759a0299da7ff
parent6886889dd23b1b7742e55e9f915c2adeb192a85a
Merge "Use glReadnPixels only if KHR_robustness is supported am: d99ba132d9 am: d01980d03d am: 1efb4d5fdd am: a03d5cd549 am: db3b4ad59a" into nyc-mr2-dev-plus-aosp
am: 6886889dd2

Change-Id: I6648d7dde9acc7e710d2f1fa7e9fd478055ce47d