am d5cc0b67: (-s ours) am 4ce5f630: Remove tests not feasible for M from mustpass
authorPyry Haulos <phaulos@google.com>
Mon, 11 Jan 2016 19:47:07 +0000 (19:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:47:07 +0000 (19:47 +0000)
am: 2dca4122eb

* commit '2dca4122eb29e0f819e7690fe95f848723bbb7f8':


Trivial merge