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)
commitac4b2aacf76649841ce3e479e3ea9a500f64a71d
treed8035aa737f78187c1a8cc1f2a3d431ae14029c6
parent678ac3aee33278d68560d0a1a0236220d1c74e90
parent2367ed287cc2a58c6f2f076de4326e074e90dc57
Merge "Merge "Remove mipmap.2d.projected from mustpass" into nyc-dev am: c59118f am: 191dde1" into nyc-mr1-dev-plus-aosp
am: 2367ed2

* commit '2367ed287cc2a58c6f2f076de4326e074e90dc57':

Change-Id: I5bc8b75145f4b9bb10941a5b7e19d771fd6fb617