tree 7512432ae76a1e0e6baddb05dbfdb42494f19245
parent e02cb2239e8dd883307af191d39c63565cf9d1e7
parent 90ec376f475dbc0a23fbd8f98989e34eacfa8494
author Baligh Uddin <baligh@google.com> 1380773341 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380773341 -0700

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

* commit '90ec376f475dbc0a23fbd8f98989e34eacfa8494':
  Import translations. DO NOT MERGE