tree 2a25bc65563c85c08c27019b2bfe7353b726176c
parent ce20cd4a22076afdb58e49ae881167871dc7e064
parent c79480476bdfb83baea4304f1f61d2b66269f564
author Baligh Uddin <baligh@google.com> 1381973497 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381973497 -0700

am c7948047: (-s ours) am 37f38236: (-s ours) Import translations. DO NOT MERGE

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