am 2dca4122: am d5cc0b67: (-s ours) am 4ce5f630: Remove tests not feasible for M...
authorPyry Haulos <phaulos@google.com>
Thu, 27 Aug 2015 14:46:55 +0000 (14:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:46:55 +0000 (14:46 +0000)
* commit '2dca4122eb29e0f819e7690fe95f848723bbb7f8':


Trivial merge