tree a7ced69aa5e7eb161c54e15ebe9256f3dc32b2d9
parent 95dbf68245482462be2b0c9798d5ab3cc2bf5b4d
parent da30029d4f21ee8a221ca0b6f6ff024749b1be34
author Mark Salyzyn <salyzyn@google.com> 1479398589 +0000
committer android-build-merger <android-build-merger@google.com> 1479398589 +0000

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

Change-Id: Idaba68a0b7bb957af60fbdb25c1db5045499691c