OSDN Git Service

am c88eba10: (-s ours) am 69e48cb6: Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Fri, 2 Nov 2012 14:34:52 +0000 (07:34 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 2 Nov 2012 14:34:52 +0000 (07:34 -0700)
commitf04bf2398aef6c0209226ebe39b55f71fbb91760
treed708a0f0d49c62de4ec342904b31173d3a26fc6c
parent47e95086b7c0951f63ff9dfeeb026a26a9164320
parentc88eba105950ec2eea5b6cd420047684659d1837
am c88eba10: (-s ours) am 69e48cb6: Import translations. DO NOT MERGE

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