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)
commitc764e9118a425f96bca8d662ccffc2dbb39cf0f1
treea230cfa58a6bdd5eee600387ed1b27f6417297a7
parentfa26a4b4120ea08bca01d5ca2829538bac3ac727
parent499cbe679f658f240e6c1d9bebf50bdd0b70e068
Merge "Fix multiple resource leaks in new srgb_texture_decode tests" am: d4a9effab0 am: cedac8ca54
am: 499cbe679f

Change-Id: I6a9e2f90465eff40681918b90d52545320d4ac4a