OSDN Git Service

am ca7f4ce9: (-s ours) am ec5a5213: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Tue, 14 Jul 2015 21:19:22 +0000 (21:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jul 2015 21:19:22 +0000 (21:19 +0000)
* commit 'ca7f4ce983d0bf25433226eb35f052741339ef12':
  Import translations. DO NOT MERGE


Trivial merge