Merge "logcat: Add -h and --help flags"
am: 23e308398f

Change-Id: Icffb5b13a46f9fe3e1903cf1255b7218948c2db8