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:02:36 +0000 (19:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Jan 2017 19:02:36 +0000 (19:02 +0000)
am: 07295a6acf

Change-Id: Idd77c360c9108d45d4bf4893d3a93cedae87df29


Trivial merge