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)
commit9a421b6be9ff68aaa7c5993a86b0406a25d6f3f0
treeb4b230ab46b3ecd2bfd2ae450c27d51b65b1e00f
parent2ec8cadcda97a3c2643d391977e4994066915cc5
parent6f140236659b5804deca33ad4c5072c95fcf6e6f
Merge "Use LDR mode when decompressing sRGB ASTC formats" am: c1c0ce48bb am: 82a5091500 am: f7bec6f999
am: 6f14023665

Change-Id: Ic826bf9b7ccbfe62c67223e3edda4677cd112f44