DO NOT MERGE: Restore accidentally reverted mustpass .txt changes am: 6b37e7d055...
authorPyry Haulos <phaulos@google.com>
Mon, 11 Jan 2016 19:54:24 +0000 (19:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:54:24 +0000 (19:54 +0000)
commitfa27066638fcbe1a4abefdc82ce51a0a8dceffbb
tree4e2946cae76df1b855c626537a142ded9edcf6fb
parentd50d3facae4bda049f36a14955b03b705b80e6c5
parente16a66ead4f405ab3b32a79af7bb5ef1727d31cb
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

* commit 'e16a66ead4f405ab3b32a79af7bb5ef1727d31cb':