am 4648b953: (-s ours) am 323c5b2a: Remove infeasible M tests.
authorKalle Raita <kraita@google.com>
Mon, 11 Jan 2016 19:48:14 +0000 (19:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:48:14 +0000 (19:48 +0000)
am: 2028771a01

* commit '2028771a01d716e288c4463d41117538b55d8fab':


Trivial merge