tree dbd689764b7f77a500368f6c36f32e3c104eba5c
parent cbc2136c28191b943d5ad8a272d6ba39c078946f
parent cfd7c2a05166a3ff27b2145b007834408d95a2e0
author Elliott Hughes <enh@google.com> 1348696999 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348696999 -0700

am cfd7c2a0: am 1c0c5250: Merge "Rename getline to fs_getline for fs_mgr"

* commit 'cfd7c2a05166a3ff27b2145b007834408d95a2e0':
  Rename getline to fs_getline for fs_mgr