OSDN Git Service

am 09364eeb: (-s ours) am b980a5be: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Sat, 11 Jul 2015 12:41:38 +0000 (12:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 11 Jul 2015 12:41:38 +0000 (12:41 +0000)
* commit '09364eebaa1c07801e5849b73c5163646b4ceb4d':
  Import translations. DO NOT MERGE


Trivial merge