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

Change-Id: I086f9bfc035dadd96877205bda499ed68bb19f1a


Trivial merge