am 019fca93: (-s ours) am 8d2a27e0: Remove problematic srgb8_alpha8_astc copy image...
authorKalle Raita <kraita@google.com>
Mon, 11 Jan 2016 19:52:16 +0000 (19:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:52:16 +0000 (19:52 +0000)
am: 4337af6eb5

* commit '4337af6eb5d6477b740cfd52a1ba2ded2b16d6d8':


Trivial merge