tree fd7d52cc58aed802c3690782cc93676c6725b31f
parent 809c369892ddbae908dc47e6a1032a768e9004cb
parent 86315c452b955bf0b874f45c1a2e15aedda91a52
author Elliott Hughes <enh@google.com> 1398893586 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398893586 +0000

am 86315c45: Merge "Fixes issue causing pseudolocalization of strings in non-translatable resource files."

* commit '86315c452b955bf0b874f45c1a2e15aedda91a52':
  Fixes issue causing pseudolocalization of strings in non-translatable resource files.