OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Tue, 29 Aug 2017 21:06:33 +0000 (21:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 29 Aug 2017 21:06:33 +0000 (21:06 +0000)
commit8c49bbb74a31361c53f1d6cc478b1a7793945265
tree836f3e1c7dd87714a22df2192a00736cc492bc63
parent1a5e87918ebe4419653f3cb93c533af292b20bb7
parentdb61e7ec7305696744bdbc6d4a8b6d44c5952ca4
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: db61e7ec73  -s ours

Change-Id: Ifb8aae76ed66234e0e39d538d84e2567f9e26003