OSDN Git Service

am fe4cb0e6: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Fri, 13 Feb 2015 01:14:55 +0000 (01:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 13 Feb 2015 01:14:55 +0000 (01:14 +0000)
* commit 'fe4cb0e6f2845e88b4d909bc240b135bf05a910b':
  Import translations. DO NOT MERGE


Trivial merge