tree 1cfe4eb2f5dab785e4f0af959afc6ef423b24a99
parent f5b3875c98e74ef6699e4af469d5b945883da3e4
parent 8d49c8b0bfdc7bed855acec603bacc355b5bcb8c
author Stephen Hines <srhines@google.com> 1417096885 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417096885 +0000

am 8d49c8b0: am f66486ef: Merge "Fix incorrect path name check."

* commit '8d49c8b0bfdc7bed855acec603bacc355b5bcb8c':
  Fix incorrect path name check.