tree 1087fec9d4d085def2fa4f4cf955b248a1fc2a49
parent 7e3afafd1bf57a071fafcd0a99819597884c16f0
parent 704fe6bc9da64c3d99db9b5a40705419aa091ce4
author Mike Lockwood <lockwood@google.com> 1348000497 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348000497 -0700

am 704fe6bc: Make sure file paths are canonical in scanFile()

* commit '704fe6bc9da64c3d99db9b5a40705419aa091ce4':
  Make sure file paths are canonical in scanFile()