OSDN Git Service

am 535bf0f8: (-s ours) am d7852b66: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 9 Mar 2015 17:01:37 +0000 (17:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 9 Mar 2015 17:01:37 +0000 (17:01 +0000)
commitc90aa638f6465f383e40b2063d38496aab7b8914
tree17a81ddea147d7a3c586adc58bce940a61f75cfa
parent89d0c0fbaec976b8b06c81a2950aed3a3c5e5b1b
parent535bf0f8e5034a9a21755df6cf158a4b95e857aa
am 535bf0f8: (-s ours) am d7852b66: (-s ours) Import translations. DO NOT MERGE

* commit '535bf0f8e5034a9a21755df6cf158a4b95e857aa':
  Import translations. DO NOT MERGE