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

* commit 'c000ef6f275b00930aefe842db14492c57f5ed89':


Trivial merge