OSDN Git Service

am 79e7d174: (-s ours) am d1e37422: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 16 Mar 2015 12:56:34 +0000 (12:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 16 Mar 2015 12:56:34 +0000 (12:56 +0000)
* commit '79e7d1747ffde2a70fc709915c55f6e149d879e4':
  Import translations. DO NOT MERGE


Trivial merge