tree 36b86d8244d4aafb1622bbb2eb03af96a2daa383
parent bf10797e538f9fa252d72710bd5ecf0ef1f6f3e0
parent fc0b4ff1c8675be3626510a5adfbcae507ecfa43
author Jean-Baptiste Queru <jbq@google.com> 1294443243 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1294443243 -0800

am fc0b4ff1: Merge "init: Fix parser line numbering"

* commit 'fc0b4ff1c8675be3626510a5adfbcae507ecfa43':
  init: Fix parser line numbering