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

Change-Id: I6a9e2f90465eff40681918b90d52545320d4ac4a


Trivial merge