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

Change-Id: Ic1a4ef9c96f1d2ea1500f175d5c7d601240cb17d


Trivial merge