am dadf7db4: Remove tests infeasible for M. am: f2f9fcead7 am: 56e9f3bb87
authorKalle Raita <kraita@google.com>
Mon, 11 Jan 2016 19:48:05 +0000 (19:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:48:05 +0000 (19:48 +0000)
am: d6647161f6

* commit 'd6647161f65047010c5ad3af101c5ba97b3c15e5':


Trivial merge