am 114eb0ab: (-s ours) am 61cf23d7: Remove a few tests from M mustpass
authorPyry Haulos <phaulos@google.com>
Mon, 11 Jan 2016 19:47:37 +0000 (19:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:47:37 +0000 (19:47 +0000)
am: 3c4fdbd832

* commit '3c4fdbd8326934b790b7dffcf665caa82fb4a934':


Trivial merge