OSDN Git Service

am 7081fd65: (-s ours) am 4fa352a2: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 1 Jun 2015 13:39:46 +0000 (13:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 13:39:46 +0000 (13:39 +0000)
commit168be08db03c69e7ad20b3b8e432b08b4e80c9c8
tree05d79a922cc06f42da7ecd019bd0f3d807a5a859
parentbbae025f104913135ae7487a64ccedbe0a5b7ec8
parent7081fd655bee82f050854aa9ec2cb6a461d95014
am 7081fd65: (-s ours) am 4fa352a2: (-s ours) Import translations. DO NOT MERGE

* commit '7081fd655bee82f050854aa9ec2cb6a461d95014':
  Import translations. DO NOT MERGE