OSDN Git Service

am d28b6bae: (-s ours) am 01492de4: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 16 Mar 2015 13:10:47 +0000 (13:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 16 Mar 2015 13:10:47 +0000 (13:10 +0000)
commit7e760e5f9c08555c9abeafcc3ab988710df238b4
tree2c865b98b8cb52f3faa81f149b99f1467789d3d6
parent79e7d1747ffde2a70fc709915c55f6e149d879e4
parentd28b6bae2491145241eb4e3a3384ed059f615234
am d28b6bae: (-s ours) am 01492de4: (-s ours) Import translations. DO NOT MERGE

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