tree 54f863d1e1b179855bf8931b5deea5d6f9264cc4
parent 530c8f4a90f205c95d34c7f41b445c1e6217c958
parent e4e2ef8ebc2c5b353467b6265cf5da49ff31b95d
author Baligh Uddin <baligh@google.com> 1382989444 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382989444 -0700

am e4e2ef8e: (-s ours) am ec930b14: (-s ours) Import translations. DO NOT MERGE

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