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

* commit 'f67aa59da1ec3f1fc31ba54e9cf2a7d6cc28ccc5':


Trivial merge