OSDN Git Service

am 4fe6117c: (-s ours) am 26310772: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Tue, 13 Jan 2015 20:16:32 +0000 (20:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jan 2015 20:16:32 +0000 (20:16 +0000)
commit18ce6a86b37baf23ef8271b7e1f9859ad9164449
tree7737ed8c81a2fe63f70ba9ce2f76e078c4e55302
parent55f432991caeeeb235e9b6c4a42dea09058c4889
parent4d232386311f8dbaa5baaa3781b592d3e527660c
am 4fe6117c: (-s ours) am 26310772: (-s ours) Import translations. DO NOT MERGE
automerge: 4d23238  -s ours

* commit '4d232386311f8dbaa5baaa3781b592d3e527660c':
  Import translations. DO NOT MERGE