OSDN Git Service

am 36f05fbe: (-s ours) am 09fbf351: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Thu, 20 Feb 2014 21:15:39 +0000 (21:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Feb 2014 21:15:39 +0000 (21:15 +0000)
commit4ee527a461f5b936e0c4471f2470440fcec086b1
treed8d2a645079e7e380315ac3c207fbaa967c7340b
parente6e6936036a540b39dab6bcf8bdbfc294969f845
parent36f05fbe454b0d349a054091fcd7b51325ad2bc1
am 36f05fbe: (-s ours) am 09fbf351: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '36f05fbe454b0d349a054091fcd7b51325ad2bc1':
  Import translations. DO NOT MERGE