tree e7739ae52375eba12c5d4706151692c1e16e9d95
parent d6c8fcd8317c6d572838832324877736fd9920a5
parent c86f1a7fb3c34a77ea1313fe2d05113a4c7ac16b
author Baligh Uddin <baligh@google.com> 1410901603 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410901603 +0000

am c86f1a7f: (-s ours) am e2ebab44: (-s ours) am 53557032: (-s ours) am 796e3c3f: (-s ours) Import translations. DO NOT MERGE

* commit 'c86f1a7fb3c34a77ea1313fe2d05113a4c7ac16b':
  Import translations. DO NOT MERGE