tree a4715d80eec22ae510bf87338cc72a445c00da5d
parent e6b93f95f792726d52518eb5f0da5ecd1c902862
parent 339e0c19d0ef7d0c59efd5eee391310ae096a4a2
author Baligh Uddin <baligh@google.com> 1392410255 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410255 +0000

am 339e0c19: (-s ours) am 3be0912b: (-s ours) am 2a44d878: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

* commit '339e0c19d0ef7d0c59efd5eee391310ae096a4a2':
  Import translations. DO NOT MERGE