OSDN Git Service

am 674d1d6b: (-s ours) am 47d342c3: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 23 Mar 2015 12:55:53 +0000 (12:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 23 Mar 2015 12:55:53 +0000 (12:55 +0000)
commit4708550ab413d0120cfe0d93daf6f200e49be625
tree87f64f088d23e423371f5190548b2a0522713c2b
parent18367b648b977bf52918bb508a0f628953cfcf6e
parent674d1d6be522defb7934c9e66e439ed99e827bc4
am 674d1d6b: (-s ours) am 47d342c3: (-s ours) Import translations. DO NOT MERGE

* commit '674d1d6be522defb7934c9e66e439ed99e827bc4':
  Import translations. DO NOT MERGE