Merge "Use LDR mode in astc.block_size_remainder sRGB cases" am: a9633080be am: 7ac1d...
authorPyry Haulos <phaulos@google.com>
Thu, 19 Jan 2017 19:05:07 +0000 (19:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Jan 2017 19:05:07 +0000 (19:05 +0000)
am: 614970b163

Change-Id: I63403f136d4c349a6ff6a9105987b77e70a4c8a0


Trivial merge