OSDN Git Service

am 05bbbfc5: (-s ours) am 0e58fb83: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 13 Jul 2015 23:37:32 +0000 (23:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Jul 2015 23:37:32 +0000 (23:37 +0000)
* commit '05bbbfc5cb24d06e5ad56b70b8b1551d8cafac03':
  Import translations. DO NOT MERGE


Trivial merge