am 63544c4f: am f2f9fcea: am dadf7db4: Remove tests infeasible for M.
authorKalle Raita <kraita@google.com>
Wed, 12 Aug 2015 00:19:55 +0000 (00:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Aug 2015 00:19:55 +0000 (00:19 +0000)
* commit '63544c4f51f84cb92903fff6d69d5d475842b051':
  Remove tests infeasible for M.


Trivial merge