OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c358d2b6dc -s ours
authorBill Yi <byi@google.com>
Fri, 26 Jan 2018 18:43:51 +0000 (18:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Jan 2018 18:43:51 +0000 (18:43 +0000)
commitb98a4c84006686271aea6b69623fa71881e35ff8
treebeb11da071fc5850e5c8cd07ecba579ef19d037b
parent55c84552cc0cab34f13084c219a0f4c4487e512b
parentc241610486e0e4b46994437d49fa130acc441190
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c358d2b6dc  -s ours
am: c241610486  -s ours

Change-Id: I0cbf79f18bb0edfb1b28220b7cc3f810e1682bb5