tree 8acc285e3c0688b50840bb525668609eb7ff4cf7
parent ba6071ed0b7e674986887c6753ee5efbf7b5b25d
parent d5c438761040510845e67979079f37da0737966f
author Baligh Uddin <baligh@google.com> 1383018913 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383018913 -0700

am d5c43876: (-s ours) am 1a0e1c0e: (-s ours) Import translations. DO NOT MERGE

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