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

* commit 'd6427848511e245895a80b771866192f653759b7':


Trivial merge