tree b5a6cac8da27f3bdfec9185eeb63e33e9c7536b6
parent 385483c3ade6e11bbb576d24fe7ef52533bbe054
parent 96ab6a71faea167a7bea1ae8eb5d98a9547f927d
author Mark Salyzyn <salyzyn@google.com> 1494880847 +0000
committer android-build-merger <android-build-merger@google.com> 1494880847 +0000

Merge "logd: logcat --clear respect pruneMargin" am: 3d0186b97e am: daae7558e8
am: 96ab6a71fa

Change-Id: Ic52878dc55b1bc2ce277a2d2e34d854c6bfc136e