Merge \"Add mipmap.2d.projected tests back to mustpass\"
authorPyry Haulos <phaulos@google.com>
Mon, 25 Jul 2016 20:45:43 +0000 (20:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Jul 2016 20:45:43 +0000 (20:45 +0000)
am: 0a874f4a2c

Change-Id: I1df077b8df4c5b875c0f13bba18ee26706cfb440


Trivial merge