tree 265671e8c6aed1c05c1671f72aa480b80ae7f2fa
parent 26545e3c60e5988a75657c0debb1ed71fd5bb39d
parent c8124d159210befc9ebddb980db6a826c17a5a5f
author Mark Salyzyn <salyzyn@google.com> 1479397280 +0000
committer android-build-merger <android-build-merger@google.com> 1479397280 +0000

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

Change-Id: I16b2e6b6c6cffcbe6b847997e0b9d579911c7e17