OSDN Git Service

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 496af8623f -s ours am...
authorBill Yi <byi@google.com>
Thu, 21 Dec 2017 19:12:14 +0000 (19:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Dec 2017 19:12:14 +0000 (19:12 +0000)
commit50f7d64f05bb0eebfb8828ce945adeaa21911ba6
treebb220531b379d75f755bf4ab287267e06a610e04
parent7835c650b2ae2f06591fe80704ef05e6140c59b2
parent25d7b576eccd7fe3cf7c6e03e8e58172329650e0
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 496af8623f  -s ours am: c81e5ae281  -s ours am: 13062c93e5  -s ours
am: 25d7b576ec  -s ours

Change-Id: Iaf6c344263bc6d3e32f0df8d14cc27327a30b3ec