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

Change-Id: Ic826bf9b7ccbfe62c67223e3edda4677cd112f44


Trivial merge