OSDN Git Service

[automerger skipped] Import translations. DO NOT MERGE am: d0b006d0c3 -s ours
authorBill Yi <byi@google.com>
Thu, 29 Mar 2018 15:42:35 +0000 (15:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Mar 2018 15:42:35 +0000 (15:42 +0000)
commitac143800eac0a18125def7f1ee5e3c5cd724c036
tree2969454bcd7a8e63460960282f65324c08100631
parent13045a9f6dc9aa8754a57a34d8712dfd96fd6eac
parentf3e5538d6e793d03c468237d9bd435ed6bd236b7
[automerger skipped] Import translations. DO NOT MERGE am: d0b006d0c3  -s ours
am: f3e5538d6e  -s ours

Change-Id: Ibff37b3821d3431660d44cfc22c0d574a80a5a35