OSDN Git Service

am ed674f5c: (-s ours) am df9fd7c8: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 27 Apr 2015 12:48:27 +0000 (12:48 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Apr 2015 12:48:27 +0000 (12:48 +0000)
* commit 'ed674f5cc3fe771a9d8637f95e204b8a7e961e9c':
  Import translations. DO NOT MERGE


Trivial merge