OSDN Git Service

am b87c7f22: (-s ours) am fe4cb0e6: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Fri, 13 Feb 2015 01:21:16 +0000 (01:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 13 Feb 2015 01:21:16 +0000 (01:21 +0000)
commit38c9024c9f7094ea454fb56081c6142ecb85272c
tree98b652aa05121d9c7ca0669abb4090ec524af5e5
parent3abe513d381dd8d8fb67b6e1f3ad10396762dd40
parentb87c7f22b5e494afe6896931f23335c7de293352
am b87c7f22: (-s ours) am fe4cb0e6: (-s ours) Import translations. DO NOT MERGE

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