OSDN Git Service

am 785bfe71: (-s ours) am 31010cc1: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Thu, 12 Feb 2015 19:31:44 +0000 (19:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 12 Feb 2015 19:31:44 +0000 (19:31 +0000)
* commit '785bfe719c408b6b188ea23a8472eccf9fbd3532':
  Import translations. DO NOT MERGE


Trivial merge