tree 164ad99da8278867da2e5e0d690269abb7bcfe87
parent ee5fb848d5f02a8d2c99cc1390001a7daedc4e66
parent 4381040f43c2d1887aea1c1ca8da8e75935db815
author Ben Cheng <bccheng@android.com> 1371502816 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371502816 -0700

am 4381040f: Merge "Change getline to not count the null terminator"

* commit '4381040f43c2d1887aea1c1ca8da8e75935db815':
  Change getline to not count the null terminator