Merge "Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 18:57:15 +0000 (18:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 18:57:15 +0000 (18:57 +0000)
am: 9df578208a

Change-Id: Iee1ff375e7596d305f3c0849be1093ea806f4ea4


Trivial merge