am d5cc0b67: (-s ours) am 4ce5f630: Remove tests not feasible for M from mustpass
authorPyry Haulos <phaulos@google.com>
Thu, 27 Aug 2015 10:45:59 +0000 (10:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:45:59 +0000 (10:45 +0000)
* commit 'd5cc0b67c402ef69eaedfd3b91cad619ae0743f4':


Trivial merge