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

Change-Id: I66c81804cf252d4fa72add8676f15fb6874a808f


Trivial merge