tree 10da860fcff71886af91d082e31f0e1917926848
parent 4335385591072ef416dbaf44faa1122728738894
parent ce2e385c089fb9a12a45156774eca6e1ad38a635
author Baligh Uddin <baligh@google.com> 1422666457 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666457 +0000

am ce2e385c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-master

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