am 1b428c0b: am 697fd17d: am 019fca93: (-s ours) am 8d2a27e0: Remove problematic...
authorKalle Raita <kraita@google.com>
Thu, 27 Aug 2015 21:00:12 +0000 (21:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 21:00:12 +0000 (21:00 +0000)
commitb221f9eec0abd8ab0719e5b42c5f89f4fef6a314
tree69eb8d3e14741b2fff2fa8ca752c3a6da5d3941c
parent7d1d6753b5903bef5356f6ab1790dbde18713ee8
parent1b428c0b307c3720bbe3e7905c9fe29e168dc0ad
am 1b428c0b: am 697fd17d: am 019fca93: (-s ours) am 8d2a27e0: Remove problematic srgb8_alpha8_astc copy image tests.

* commit '1b428c0b307c3720bbe3e7905c9fe29e168dc0ad':