am 952970c8: DO NOT MERGE: Do not spam activity manager if remote dies. am: 313f09064...
authorJarkko Pöyry <jpoyry@google.com>
Mon, 11 Jan 2016 19:36:23 +0000 (19:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:36:23 +0000 (19:36 +0000)
am: 3c700f6ebd  -s ours

* commit '3c700f6ebd25b6b78ce656fe605eeada4729f7fd':


Trivial merge