tree f2cc1c88198ca6fc0a5526eab81b87074d109c46
parent 9bc59c20d0bc0683c537560ea92c581eeaf1ebe9
parent 4487e0aac4270f3ab429d27f454d4eb1efb19a6b
author Baligh Uddin <baligh@google.com> 1392936046 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392936046 +0000

am 4487e0aa: (-s ours) am beb7bc60: (-s ours) Import translations. DO NOT MERGE

* commit '4487e0aac4270f3ab429d27f454d4eb1efb19a6b':
  Import translations. DO NOT MERGE