Merge \\\"Add mipmap.2d.projected tests back to mustpass\\\" am: 0a874f4a2c am: 0a50a...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 17:23:41 +0000 (17:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:23:41 +0000 (17:23 +0000)
am: 36803c418b

Change-Id: I562dc62172c514e823ac066965a20b1da37ca2b0


Trivial merge