am 114eb0ab: (-s ours) am 61cf23d7: Remove a few tests from M mustpass
authorPyry Haulos <phaulos@google.com>
Thu, 27 Aug 2015 10:46:04 +0000 (10:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:46:04 +0000 (10:46 +0000)
* commit '114eb0abd61f7eb09c03d0d61155fab5fc086d98':


Trivial merge