am f02e6a9a: am 97d73d61: (-s ours) am dadf7db4: Remove tests infeasible for M.
authorKalle Raita <kraita@google.com>
Thu, 27 Aug 2015 14:47:03 +0000 (14:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:47:03 +0000 (14:47 +0000)
* commit 'f02e6a9a2b93048393bfd03cd2eec0e60138c8a2':


Trivial merge