am dadf7db4: Remove tests infeasible for M.
authorKalle Raita <kraita@google.com>
Tue, 11 Aug 2015 23:35:53 +0000 (23:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 11 Aug 2015 23:35:53 +0000 (23:35 +0000)
* commit 'dadf7db48256f248fc09e085b9eff69826422ab1':
  Remove tests infeasible for M.


Trivial merge