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

Change-Id: Id49fa0c9427c52cfd189bcae0e29c932eec5e06a


Trivial merge