tree 7ab926c1d670417ccd4b8581c9bf49bb78d5d357
parent 286ecf1ea594059eb097b81709c0dc1ead246be7
parent f0d79e57349a4f18b61e9a380a19124fb6c8d8fd
author Baligh Uddin <baligh@google.com> 1383797230 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383797230 -0800

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

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