tree a737466352dfb9b86eb174a22f8215699755b1cc
parent 124b7cb732eaa9660cd119d4e86f0aed79e30625
parent 37573550fb5be796c474d4309d34ef08c4b8368e
author Mark Salyzyn <salyzyn@google.com> 1479397734 +0000
committer android-build-merger <android-build-merger@google.com> 1479397734 +0000

Merge "logcat: add hidden --debug flag and cleanup" am: c097c79b77 am: c8124d1592
am: 37573550fb

Change-Id: I8d249346fcd4459a81e5a2a8943b7223c7cb66bd