OSDN Git Service

am 61fe962f: (-s ours) am cafcb70a: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Tue, 11 Nov 2014 00:47:47 +0000 (00:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 11 Nov 2014 00:47:47 +0000 (00:47 +0000)
commit13da7679407ad0a69e7f055689b3e502864697f2
tree3ee7a3500ae44c5fff2886be497365c902709b41
parentabece484b682c426b864ec877f352435db5f531c
parent61fe962f9072dffd6ebbe9be2870b55ddd9617c5
am 61fe962f: (-s ours) am cafcb70a: (-s ours) Import translations. DO NOT MERGE

* commit '61fe962f9072dffd6ebbe9be2870b55ddd9617c5':
  Import translations. DO NOT MERGE