tree adc2ae18ee985f03904caff24b7fe07073644cc2
parent 22522cb762173c18e9baffaae0c3ba2a05fdbbc3
parent 33fe64266276deedb3c0f49f0d23eff70af886f4
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