tree 6e28aa8b1f8a1d49d2bbeaf24faf7b58c1815c93
parent 5372abceb057491c2ccd22d79ddf47508f49ee5e
parent 571866cd42918d9227db8424667c585b8f9fdf94
author John Reck <jreck@android.com> 1349460913 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349460913 -0700

am 571866cd: Merge "Make locale safe paths"

* commit '571866cd42918d9227db8424667c585b8f9fdf94':
  Make locale safe paths