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

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


Trivial merge