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

Change-Id: I48306394fd0d053c2a8a7f75b0bf6cadab196416


Trivial merge