OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Tue, 27 Jun 2017 20:06:53 +0000 (20:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Jun 2017 20:06:53 +0000 (20:06 +0000)
commit4b7bc479da7891367176c18c874cbfa98a59c020
tree2f0cfbee75023122907f831c7eb3a3db11926127
parentd695f232d5ddd8155174b8e78b6b713fd85b548f
parent98bbb157a9fcceb8ff6fe7b937694988309b41af
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 98bbb157a9  -s ours

Change-Id: I65f40eb6eacfc157266ce57420bc9a1b6f508a6d