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

* commit '9f276d5708b5067aef1f1be0be3be2ca9743d4e5':


Trivial merge