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

Change-Id: I31749dfd7ca7258c702b3d00c3f438cebbbf4056


Trivial merge