OSDN Git Service

am 9c00c3d5: (-s ours) am 8510d014: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 8 Dec 2014 19:42:50 +0000 (19:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Dec 2014 19:42:50 +0000 (19:42 +0000)
commitc34118a70d5a9e91cfbb5c532d74aedd3d67d968
treef9bab3b1da80126380e2c2dc5e4800dc76efe5b6
parentf10f2f47b5db1132362af9c76a1577ccc95fb92d
parent9c00c3d57fcbaedfab096041fee4f4c2468b3ebf
am 9c00c3d5: (-s ours) am 8510d014: (-s ours) Import translations. DO NOT MERGE

* commit '9c00c3d57fcbaedfab096041fee4f4c2468b3ebf':
  Import translations. DO NOT MERGE