OSDN Git Service

am 9ee5df4b: (-s ours) am 4516c695: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Wed, 23 Apr 2014 02:15:17 +0000 (02:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 23 Apr 2014 02:15:17 +0000 (02:15 +0000)
commitc925a37100015314a15b1b6eed68f39c8c657839
treed118ec8c8a64722569d0e7d1043817b0b0202628
parent22ee2fe70bb01e8a7db8e2cb28b8c2fba56b01c5
parent9ee5df4b126d9f61dd5deeff60e5682d3acfa699
am 9ee5df4b: (-s ours) am 4516c695: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '9ee5df4b126d9f61dd5deeff60e5682d3acfa699':
  Import translations. DO NOT MERGE