OSDN Git Service

am 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Thu, 20 Feb 2014 18:07:02 +0000 (18:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Feb 2014 18:07:02 +0000 (18:07 +0000)
commit2f5347ee46766134848586d67d2dd86bdc9d1952
tree1c7669753ee3355ffc7a699a225cf5afda97794c
parent5da96060e61c3076d0a5cbd87a3f17254414afeb
parent1af20cc5764a38d0713a292fd63bf6a628f2f5eb
am 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '1af20cc5764a38d0713a292fd63bf6a628f2f5eb':
  Import translations. DO NOT MERGE