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

* commit '1d4411130e378c7f77ff45e89d76547342df81d6':


Trivial merge