OSDN Git Service

am 2e1d2ed6: (-s ours) am 91bceebd: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Mon, 27 Oct 2014 05:36:49 +0000 (05:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Oct 2014 05:36:49 +0000 (05:36 +0000)
commit7c2cbc434014cdafd0cfd3c45e6f0949bccdc6c4
treeff0760f267f88ee73c831d8d4d4be8c1655bbbc3
parent18f6c5193afd753455bec5f4edef43c1e1a99838
parent2e1d2ed664bf9a0b91424d19d158f1ea2b58c8fd
am 2e1d2ed6: (-s ours) am 91bceebd: (-s ours) Import translations. DO NOT MERGE

* commit '2e1d2ed664bf9a0b91424d19d158f1ea2b58c8fd':