Merge "Use safe glFramebufferTexture* function"
authorjames.glanville <james.glanville@imgtec.com>
Wed, 16 Aug 2017 19:04:43 +0000 (19:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 16 Aug 2017 19:04:43 +0000 (19:04 +0000)
am: ec5ccbe144

Change-Id: I156ecc2a6ed17e3e23ef17ebbe026be27c1670c3


Trivial merge