OSDN Git Service

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


Trivial merge