am 68054b54: am 4c62736a: am 3a7d4b4e: Merge "logd: missing klogd content"

* commit '68054b545e8113188031182521c6918240de46f9':
  logd: missing klogd content