Merge "Use LDR mode when decompressing sRGB ASTC formats" am: c1c0ce48bb am: 82a50915...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 19:17:08 +0000 (19:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 19:17:08 +0000 (19:17 +0000)
am: 9a421b6be9

Change-Id: I10c94e9fb16a6e85abbc94a037dd595687558efe


Trivial merge