OSDN Git Service

am 9e442523: (-s ours) am 6b590746: (-s ours) am 1955bf1b: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Tue, 8 Oct 2013 03:59:58 +0000 (20:59 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Oct 2013 03:59:58 +0000 (20:59 -0700)
commit30d46a60d7e9f13974d5a52568f51efc328c1c05
tree14fb0b0b3b50ede1651cd4ba42221145c5c30cda
parent0bea2625dd593aec48fa9e946206578a2ec3f26a
parent9e4425231efc19997f69376927ab8ef4c0ff0f7a
am 9e442523: (-s ours) am 6b590746: (-s ours) am 1955bf1b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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