tree 4b9ac5798076ff0ca22f3cbd27d141b00cc50be0
parent 977fd06dffc4b941c87f6800909c1d2bf279d81f
parent e7c4f8ca0660298604b0081a80591b39aefda661
author Elliott Hughes <enh@google.com> 1354551325 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354551325 -0800

am e7c4f8ca: Merge "Make locale safe paths"

* commit 'e7c4f8ca0660298604b0081a80591b39aefda661':
  Make locale safe paths