tree bfd62a9cd4ea213cec6e9c17341f811d72c0a6e7
parent 47ef29c508f2b151292bcb71c2c7e5e865697509
parent f92446c0c166b3a0d4d1393ca80939c49b5eed95
author Baligh Uddin <baligh@google.com> 1383695394 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383695394 -0800

am f92446c0: (-s ours) am d2d7f605: (-s ours) Import translations. DO NOT MERGE

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