tree 0ee0dc298642be0fa84924964b35d80a6d3efa64
parent 7abb0567079a6a469166606886e29a10727f9496
parent 4491efe5a4c075eb85fb59ff5a72278e47ad7848
author Mark Salyzyn <salyzyn@google.com> 1465595606 +0000
committer android-build-merger <android-build-merger@google.com> 1465595606 +0000

Merge \\"logcatd: add stop and clear actions\\" am: 2546a7f8fd
am: d62a49b202

Change-Id: If43511b6ad876695cfb1b7993cb4355e5d9e475e