OSDN Git Service

am 2f07a705: (-s ours) am 50d0afa4: (-s ours) am 2f5347ee: (-s ours) am 1af20cc5...
authorBaligh Uddin <baligh@google.com>
Thu, 20 Feb 2014 18:17:41 +0000 (18:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Feb 2014 18:17:41 +0000 (18:17 +0000)
commit46f1744acf7bd795ac80ed10a5b6bd3f03682b46
tree9b4509e070e1a5aa5b484eaa3b52335c5b3f21f0
parente16fe1aa7cd332ddf09d25ae2fee43d6c5cb884a
parent2f07a7059f4471963c114b0ab944249e8746cbf9
am 2f07a705: (-s ours) am 50d0afa4: (-s ours) am 2f5347ee: (-s ours) am 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '2f07a7059f4471963c114b0ab944249e8746cbf9':
  Import translations. DO NOT MERGE