Merge "Use LDR mode when decompressing sRGB ASTC formats" am: c1c0ce48bb
authorPyry Haulos <phaulos@google.com>
Thu, 19 Jan 2017 16:03:24 +0000 (16:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Jan 2017 16:03:24 +0000 (16:03 +0000)
am: 82a5091500

Change-Id: I3ee7371c051dd73e09cdf885c30a9684a402d4be


Trivial merge