OSDN Git Service

am 5a04fb76: (-s ours) am 74a503fd: (-s ours) am 622b5d2a: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Tue, 12 Nov 2013 04:51:28 +0000 (20:51 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 12 Nov 2013 04:51:28 +0000 (20:51 -0800)
commit9f4da288998d8c35938caede9172e291f7da1f05
tree8b34db60bc435786a052c980ed8d98420bf80b2c
parent71504b1f71404c3e89e362b8a2985f33457b0d5c
parent5a04fb76dacbc6b0e030f726f4a03642a108b4dd
am 5a04fb76: (-s ours) am 74a503fd: (-s ours) am 622b5d2a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '5a04fb76dacbc6b0e030f726f4a03642a108b4dd':
  Import translations. DO NOT MERGE