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

Change-Id: Id5201c4bf95d6127d9ee71da302c64b5d6a2c1b1


Trivial merge