OSDN Git Service

am 4e3575eb: (-s ours) am 4c77d6a7: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Tue, 14 Jul 2015 21:18:38 +0000 (21:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jul 2015 21:18:38 +0000 (21:18 +0000)
* commit '4e3575eb98e1b60600a9146862ab190491eec035':
  Import translations. DO NOT MERGE


Trivial merge