tree adc2ae18ee985f03904caff24b7fe07073644cc2
parent 9d4b3010b5b8c9e6c155df2ec1da4a33992a1ebd
parent 765207524fcbe261686c5d96bc42ea3dcc124f0a
author Mark Salyzyn <salyzyn@google.com> 1429828488 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429828488 +0000

am 76520752: Merge "rootfs: init.rc start logd parse error"

* commit '765207524fcbe261686c5d96bc42ea3dcc124f0a':
  rootfs: init.rc start logd parse error