OSDN Git Service

am d104a377: (-s ours) am 6c8e9296: (-s ours) am 13c48fba: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Wed, 23 Apr 2014 02:24:21 +0000 (02:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 23 Apr 2014 02:24:21 +0000 (02:24 +0000)
commit6fde3fb23c6537b4ade4ecc1c86162aef2dc502d
treefeb783ef2cbcea5887ef93264ed075b5f4dac9b4
parentc2cecf36d6863a0ca6c6c9d94b7dff32206ab0ed
parentd104a377ab9e9df4b38beba4aab40685e2709a64
am d104a377: (-s ours) am 6c8e9296: (-s ours) am 13c48fba: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

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