OSDN Git Service

am 521c3909: (-s ours) am 4732765a: (-s ours) am eb29ae19: (-s ours) am 45289c3d...
authorGeoff Mendal <mendal@google.com>
Tue, 14 Jul 2015 00:42:23 +0000 (00:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jul 2015 00:42:23 +0000 (00:42 +0000)
commit5c9598637a263a325dbe2d58fd0dfa7abe1d7c2a
tree4b6dbf38946d03c857f41808e184c6a282a41a54
parent834de67403bf1be7a01f2b622174ef65cb611f4d
parent521c390994117d6d2b819bf9f69c4e31fc305e22
am 521c3909: (-s ours) am 4732765a: (-s ours) am eb29ae19: (-s ours) am 45289c3d: (-s ours) Import translations. DO NOT MERGE

* commit '521c390994117d6d2b819bf9f69c4e31fc305e22':
  Import translations. DO NOT MERGE