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

Change-Id: I05b273c4c5842ef9713cea1e0ee5db14965bc6df


Trivial merge