OSDN Git Service

am 650418e5: (-s ours) am f288f992: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 13 Jul 2015 15:32:22 +0000 (15:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Jul 2015 15:32:22 +0000 (15:32 +0000)
commit447a1008c638706092aae7620079060ec3a0c74c
tree547117f668ea31f8424844206e27f34c81ed9547
parent82df9b722e84ad1d4f6918c4e4c3136b28164581
parent650418e5a76e96bb03b5839a8a4ec36dd2106131
am 650418e5: (-s ours) am f288f992: (-s ours) Import translations. DO NOT MERGE

* commit '650418e5a76e96bb03b5839a8a4ec36dd2106131':
  Import translations. DO NOT MERGE