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)
am: fa27066638  -s ours

* commit 'fa27066638fcbe1a4abefdc82ce51a0a8dceffbb':


Trivial merge