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:51:54 +0000 (19:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:51:54 +0000 (19:51 +0000)
am: 60152129ac

* commit '60152129acf2b7429a737aaa502da2bfa05908d7':


Trivial merge