Merge "Use LDR mode when decompressing sRGB ASTC formats" am: c1c0ce48bb am: 82a50915...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 19:17:08 +0000 (19:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 19:17:08 +0000 (19:17 +0000)
commit17121ed6885f04bcd030014874eabb0e106aa8f8
treef83c4ae88105474ccba79791513065abe1ff2c93
parent32475d64afd372f04cc21e0613c0c49a76e2625d
parent9a421b6be9ff68aaa7c5993a86b0406a25d6f3f0
Merge "Use LDR mode when decompressing sRGB ASTC formats" am: c1c0ce48bb am: 82a5091500 am: f7bec6f999 am: 6f14023665
am: 9a421b6be9

Change-Id: I10c94e9fb16a6e85abbc94a037dd595687558efe