OSDN Git Service

am fd5e4617: (-s ours) am f2e29071: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Sun, 6 Jul 2014 18:13:04 +0000 (18:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 6 Jul 2014 18:13:04 +0000 (18:13 +0000)
commitc1f450dc64d43c0893858538c96fd0a1e7992565
tree4858d9ac57410a2c4b2984eb831d6f99fde1a720
parent16b3c3750f9a6ea13f313eb5e76ae3adbfb6fc83
parentfd5e46171db33fc2f5dcb6fbfbb6b19e36e9b485
am fd5e4617: (-s ours) am f2e29071: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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