am ba06b825: am a1665665: am 4ce5f630: Remove tests not feasible for M from mustpass
authorPyry Haulos <phaulos@google.com>
Mon, 27 Jul 2015 19:00:42 +0000 (19:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Jul 2015 19:00:42 +0000 (19:00 +0000)
* commit 'ba06b82501c9e806ec52aa79f700391ee58fea57':
  Remove tests not feasible for M from mustpass


Trivial merge