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

Change-Id: I3c85f418c4df802dbfd5edbef6978919e5ed4baf


Trivial merge