OSDN Git Service

am 6acdd044: (-s ours) am 795c8378: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 20 Oct 2014 23:47:51 +0000 (23:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 20 Oct 2014 23:47:51 +0000 (23:47 +0000)
commitcd617f6cbef7e3449648b26bf37d44422b719937
treef466737f0d3f5df74a83370089525a22d8cab446
parent50d4d2d39a041fcb2ee0c56d9425650e2f8557bd
parent6acdd044d7b3f77ff1f47e9addc2acdbc16e5b8d
am 6acdd044: (-s ours) am 795c8378: (-s ours) Import translations. DO NOT MERGE

* commit '6acdd044d7b3f77ff1f47e9addc2acdbc16e5b8d':
  Import translations. DO NOT MERGE