OSDN Git Service

am 6ccde759: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Wed, 24 Dec 2014 18:57:55 +0000 (18:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 24 Dec 2014 18:57:55 +0000 (18:57 +0000)
commit20c1404198aa6948aee6374b29daa292f47c1cf6
treea30a7ed816bf8a0581f395384ee4b2fb09ee4c91
parent9e1a3d6fc58a99cdc15024d8447744e1eaff10ba
parent6ccde759cb6ca078ed47696b1cb7092e6ff96927
am 6ccde759: (-s ours) Import translations. DO NOT MERGE

* commit '6ccde759cb6ca078ed47696b1cb7092e6ff96927':
  Import translations. DO NOT MERGE