OSDN Git Service

am 0347196c: (-s ours) am 1dcc3e5c: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 7 Jan 2015 14:34:03 +0000 (14:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Jan 2015 14:34:03 +0000 (14:34 +0000)
commit634b17063b79167ae0c0459afa7b528d933c4011
tree275d75b1ed6c5feea7c86924af3b520e3ef6ba17
parent620a5bd077c7077058f460af5025ad7d2cd94758
parent0347196c6992e490be74c2a4015bc6cd64504f15
am 0347196c: (-s ours) am 1dcc3e5c: (-s ours) Import translations. DO NOT MERGE

* commit '0347196c6992e490be74c2a4015bc6cd64504f15':
  Import translations. DO NOT MERGE