am b4e405cd: am 656f05e3: (-s ours) am 31801e06: Remove mipmap.cube.projected tests...
authorPyry Haulos <phaulos@google.com>
Thu, 27 Aug 2015 14:46:56 +0000 (14:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:46:56 +0000 (14:46 +0000)
* commit 'b4e405cd0516b7234eb0db287f98472e3edc3f86':


Trivial merge