Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat...
authorPyry Haulos <phaulos@google.com>
Thu, 24 Aug 2017 17:50:25 +0000 (17:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 17:50:25 +0000 (17:50 +0000)
am: 5da73a2fc6  -s ours

Change-Id: I234549ca744f9552df7e7d9116c490a5ae93a882


Trivial merge