tree fc73b3e653ec186d7a19f9ac4f1ced32faa504ca
parent 67d94e92d91d40f0ecf1ffd84dc899e1a20f1e81
parent 7c023c4ae4ea52824e81cc771dcc2c2013722bf6
author Baligh Uddin <baligh@google.com> 1398805883 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398805883 +0000

am 7c023c4a: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-nova

* commit '7c023c4ae4ea52824e81cc771dcc2c2013722bf6':
  Import translations. DO NOT MERGE