OSDN Git Service

am 20c14041: (-s ours) am 6ccde759: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Wed, 24 Dec 2014 19:04:56 +0000 (19:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 24 Dec 2014 19:04:56 +0000 (19:04 +0000)
commit478e056fc5bf0fd8a40691d83d13ca5743d902b4
tree808849569b06cbe6dfdbc35e168a6f6b7e5fa140
parent36ddc8a1c35acde818c288544dbef4faaa86093f
parent20c1404198aa6948aee6374b29daa292f47c1cf6
am 20c14041: (-s ours) am 6ccde759: (-s ours) Import translations. DO NOT MERGE

* commit '20c1404198aa6948aee6374b29daa292f47c1cf6':
  Import translations. DO NOT MERGE