OSDN Git Service

am bbd70391: (-s ours) am 13cbe053: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Sat, 1 Aug 2015 16:34:39 +0000 (16:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 1 Aug 2015 16:34:39 +0000 (16:34 +0000)
* commit 'bbd703914a81b63e15e32a3530d815298f4a6f8c':
  Import translations. DO NOT MERGE


Trivial merge