DO NOT MERGE: Restore accidentally reverted mustpass .txt changes am: 6b37e7d055...
authorPyry Haulos <phaulos@google.com>
Mon, 21 Dec 2015 22:29:32 +0000 (22:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 Dec 2015 22:29:32 +0000 (22:29 +0000)
commit6ef07b2dc5fd9205e2a319626a5a28ab49d85b8e
tree6dfce8a600f29cd9c2b6c0c6f4148ab5da6c9f3c
parentfc353a7ad4383948ac52ffab646ba82d302168fe
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