DO NOT MERGE: Restore accidentally reverted mustpass .txt changes am: 6b37e7d055...
authorPyry Haulos <phaulos@google.com>
Mon, 11 Jan 2016 19:52:31 +0000 (19:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:52:31 +0000 (19:52 +0000)
commite16a66ead4f405ab3b32a79af7bb5ef1727d31cb
tree92f018857dcb963f23b429f699c3c627fde154d4
parent41cd9b015353247f3a6bf397716c81666fa676a4
parent4661d3164650bd8e510903f0633e17244abadc76
DO NOT MERGE: Restore accidentally reverted mustpass .txt changes am: 6b37e7d055  -s ours am: 9db7fe6a6b  -s ours am: 46e148f2c8
am: 4661d31646  -s ours

* commit '4661d3164650bd8e510903f0633e17244abadc76':
  DO NOT MERGE: Restore accidentally reverted mustpass .txt changes