Merge "logd: correctly label identical lines"
am: a9b5a5e96a

Change-Id: I0cd6ad498e46bbaa2c78ee8ad95b920b309edd90