am 97d73d61: (-s ours) am dadf7db4: Remove tests infeasible for M. am: f02e6a9a2b
authorKalle Raita <kraita@google.com>
Mon, 11 Jan 2016 19:50:29 +0000 (19:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:50:29 +0000 (19:50 +0000)
am: 894983f607

* commit '894983f607c8a260558e480e23a56081481dcc63':


Trivial merge