DO NOT MERGE: Restore accidentally reverted mustpass .txt changes
authorPyry Haulos <phaulos@google.com>
Mon, 21 Dec 2015 22:15:53 +0000 (22:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 Dec 2015 22:15:53 +0000 (22:15 +0000)
am: 6b37e7d055  -s ours

* commit '6b37e7d0559411b685afc824a438b592e3af835c':
  DO NOT MERGE: Restore accidentally reverted mustpass .txt changes


Trivial merge