Merge "Fix multiple resource leaks in new srgb_texture_decode tests" am: d4a9effab0
authorMark Adams <marka@nvidia.com>
Tue, 21 Feb 2017 19:00:47 +0000 (19:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 21 Feb 2017 19:00:47 +0000 (19:00 +0000)
am: cedac8ca54

Change-Id: I87588c2347aa38ad93764b605e116cc4da34d289


Trivial merge