Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:19:06 +0000 (16:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:19:06 +0000 (16:19 +0000)
am: bfa02fb74d  -s ours

Change-Id: I43303c670a5ea08890127d2523297604b9b7588d


Trivial merge