tree c42084a7bf66d21c6a2b2a837fbb68d6abca0739
parent 991ba3b7f2d7164fab956b54c711d5ea523b2ba5
parent 04d02d9731e0a199d22ad1408cbca1d39bdc4c91
author Narayan Kamath <narayan@google.com> 1387371944 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387371944 +0000

am 04d02d97: am 39d76302: am 3da645f3: Merge "Don\'t pseudolocalize untranslatable strings."

* commit '04d02d9731e0a199d22ad1408cbca1d39bdc4c91':
  Don't pseudolocalize untranslatable strings.