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


Trivial merge