OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Tue, 27 Jun 2017 20:02:19 +0000 (20:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Jun 2017 20:02:19 +0000 (20:02 +0000)
commited8860238c09c1d36993a38d99e22f6a18e9d026
tree82f93790407f55dd3e2c6556766069837fe8c0bc
parent3e36e13cfaef8c24b212675d3b3ed787522e8551
parent852e0aacc226c917cfd55473690385a6062fa7df
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 852e0aacc2  -s ours

Change-Id: Ic393c2f71f4f0d5fe201936acaeded3be9c741d5