tree 95254ffe9871f5cf0702d3930b23b807a8ff38a7
parent d17b576d5ef220d5ae6ce6373a12a02fc512e249
parent f222e28849cfabe4c601a785e4618bf92bbfe62e
author Baligh Uddin <baligh@google.com> 1379214534 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379214534 -0700

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

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