Merge "Use safe glFramebufferTexture* function" am: ec5ccbe144
authorjames.glanville <james.glanville@imgtec.com>
Thu, 24 Aug 2017 18:05:52 +0000 (18:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 18:05:52 +0000 (18:05 +0000)
am: d4c3e6e71b

Change-Id: I389324c9220d9a7860a2ae749b02051b6b05dfe7


Trivial merge