tree 4788a0e414f7697819f4e670059457cde1dc5045
parent a44aca6580b6f39459195275f4631682410aae4b
parent f5cb0a138528144f3bb1cf6bbcb3c4e4ad5e9dc9
author Jean-Baptiste Queru <jbq@google.com> 1294786561 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1294786561 -0800

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

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