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

Change-Id: I0749263435d46a05108fd22f626e06cae6a3658d


Trivial merge