DO NOT MERGE: Restore accidentally reverted mustpass .txt changes am: 6b37e7d055...
authorPyry Haulos <phaulos@google.com>
Mon, 11 Jan 2016 19:58:21 +0000 (19:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:58:21 +0000 (19:58 +0000)
commitccd70e0dd15943632c171d3824d535b542be8348
tree5f507d4c875a64164d516a0f841ac97be3b55406
parent7c29407f2aab54a832f2dc562eb6fb40e247ffad
parentfa27066638fcbe1a4abefdc82ce51a0a8dceffbb
DO NOT MERGE: Restore accidentally reverted mustpass .txt changes am: 6b37e7d055  -s ours am: 9db7fe6a6b  -s ours am: 46e148f2c8 am: 4661d31646  -s ours am: e16a66ead4  -s ours
am: fa27066638  -s ours

* commit 'fa27066638fcbe1a4abefdc82ce51a0a8dceffbb':