tree 8aa3d476209144b7cacf092f5244a010e9e1a5c2
parent 457e9215df2a8353f484a268950623d714afa01c
parent beb7bc6028eeeea160b17df800b0a886eecd1c9b
author Baligh Uddin <baligh@google.com> 1392930785 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392930785 +0000

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

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