Merge "Merge "Remove mipmap.2d.projected from mustpass" into nyc-dev am: c59118f...
authorPyry Haulos <phaulos@google.com>
Tue, 19 Apr 2016 19:30:47 +0000 (19:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 19 Apr 2016 19:30:47 +0000 (19:30 +0000)
am: 2367ed2

* commit '2367ed287cc2a58c6f2f076de4326e074e90dc57':

Change-Id: I5bc8b75145f4b9bb10941a5b7e19d771fd6fb617


Trivial merge