tree 1d279871a5b170d7f405dfb337d3971937730db1
parent 99dddecdbdf0ddaf1ee53f52fccd735de88181a8
parent a321f5274b2fbb45932908690a84342ce63de453
author Baligh Uddin <baligh@google.com> 1395341345 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395341345 +0000

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

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