OSDN Git Service

am 642c4fc5: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Fri, 29 May 2015 19:19:20 +0000 (19:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 29 May 2015 19:19:20 +0000 (19:19 +0000)
* commit '642c4fc527da40cf4697d3630bdebdfc1044ab82':
  Import translations. DO NOT MERGE


Trivial merge