OSDN Git Service

am ca7f4ce9: (-s ours) am ec5a5213: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Tue, 14 Jul 2015 21:19:22 +0000 (21:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jul 2015 21:19:22 +0000 (21:19 +0000)
commit498af6a5693cde49419f3a9abcfeb572d3a461e2
tree5d1ef8988582eff274989959c736d5b29dadc77a
parent4e3575eb98e1b60600a9146862ab190491eec035
parentca7f4ce983d0bf25433226eb35f052741339ef12
am ca7f4ce9: (-s ours) am ec5a5213: (-s ours) Import translations. DO NOT MERGE

* commit 'ca7f4ce983d0bf25433226eb35f052741339ef12':
  Import translations. DO NOT MERGE