tree 7ae314e52a2745b8c353ee85ec2acf0279456947
parent 52e925fc3b61fdef0e7218fb89d7e154b95ff447
parent 16f31d6fbe946ce7912ee6ddddd4b3660d3e66e7
author Marco Nelissen <marcone@google.com> 1337784375 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337784375 -0700

am 16f31d6f: Merge "Handle _ and % in paths" into jb-dev

* commit '16f31d6fbe946ce7912ee6ddddd4b3660d3e66e7':
  Handle _ and % in paths