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)
commit6f140236659b5804deca33ad4c5072c95fcf6e6f
tree113ae5169357fe0026206ce3461bcb0c331fdc2b
parent833b10c828bc3523b70e1d38194c59cba21129b4
parentf7bec6f9997dcf19540ad77eb2eb890f870181e3
Merge "Use LDR mode when decompressing sRGB ASTC formats" am: c1c0ce48bb am: 82a5091500
am: f7bec6f999

Change-Id: I086f9bfc035dadd96877205bda499ed68bb19f1a