Merge "logd: correctly label identical lines"