OSDN Git Service

am ede11beb: (-s ours) am 34663b0f: (-s ours) am 36c35f23: (-s ours) Import translati...
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 14:28:49 +0000 (14:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 14:28:49 +0000 (14:28 +0000)
commit5559d54b4472979a423ed7b94f6d4803107b9c86
tree1a2f9f69674820540d354e52e905eeb43d03713d
parent684332f23fc40b49452c7ee4f8f53aafbecb0e0a
parentede11beb9c3a05dad2628809641c16398e3fbeb0
am ede11beb: (-s ours) am 34663b0f: (-s ours) am 36c35f23: (-s ours) Import translations. DO NOT MERGE

* commit 'ede11beb9c3a05dad2628809641c16398e3fbeb0':
  Import translations. DO NOT MERGE