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

* commit '697fd17d1962d9512871a36379051be5bca20ab6':


Trivial merge