tree 128bb85a92cc0c7840346847b9ac0abfb45d7973
parent f0f0326e3fd95d58c7ad9012ac530b944cd8056f
parent afce72a1a132fb9a478efa00f9e8f65de23b7217
author Baligh Uddin <baligh@google.com> 1392411175 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411175 +0000

am afce72a1: (-s ours) am 10daf361: (-s ours) am 0b4a8442: (-s ours) am 91c7f77d: (-s ours) am 29cff2d2: (-s ours) Import translations. DO NOT MERGE

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