tree d7b27cf15f31220875f8f93930c9e249f27eaeca
parent e599d359ad739d51f2db22712f756ecaf9bff235
parent 1de64c40429f32413be6878ec9538713bc25cf87
author Baligh Uddin <baligh@google.com> 1379220285 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379220285 -0700

am 1de64c40: (-s ours) am 04d37096: (-s ours) Import translations. DO NOT MERGE

* commit '1de64c40429f32413be6878ec9538713bc25cf87':
  Import translations. DO NOT MERGE