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

* commit '9db7fe6a6bb680ea360e62dd895e6df263d6f652':
  DO NOT MERGE: Restore accidentally reverted mustpass .txt changes


Trivial merge