OSDN Git Service

am b5cdb04a: (-s ours) am 8bab49cd: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Thu, 3 Oct 2013 22:40:58 +0000 (15:40 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Oct 2013 22:40:58 +0000 (15:40 -0700)
commit6e5ae5008b647d996be7688db9a974ea00dd0be9
tree47843a83bb71c4d2746614aa2b592792481d558b
parentd7b30dd25a10169440241bb6c8053dfdc3023d1f
parentb5cdb04a80b0b6d3d46b969f95678b0002130220
am b5cdb04a: (-s ours) am 8bab49cd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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