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

* commit '1d3ecff66bf20c9b2220d9560a5a9aabc5fcfe5d':


Trivial merge