OSDN Git Service

am ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
authorBaligh Uddin <baligh@google.com>
Thu, 26 Dec 2013 18:43:19 +0000 (10:43 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 26 Dec 2013 18:43:19 +0000 (10:43 -0800)
commitdd6517c9dff66a2165e147201e813e1f305425c2
tree55bebd844cd8e1cde6572af39a0f732f99fb36f8
parente965be75746d898611ee15d601dc97c8b206a542
parentea227306d68c7097b9cb079b1bfa6157c1ec2d30
am ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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