tree d1103f511dc645b4107235d4b273a519aeec74a4
parent ce2e385c089fb9a12a45156774eca6e1ad38a635
parent 916421cadc68d4b0416024cdb6cbd6b554e2cd3f
author Baligh Uddin <baligh@google.com> 1408082019 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408082019 +0000

am 916421ca: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop

* commit '916421cadc68d4b0416024cdb6cbd6b554e2cd3f':
  Import translations. DO NOT MERGE