From: Bill Yi <byi@google.com>
Date: Sat, 22 Jul 2017 16:47:52 +0000 (+0000)
Subject: Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 4d7111b0e9 ... 
X-Git-Tag: android-x86-9.0-r1~345
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e079b45c81b5349b118a05dd71fc632409ce4f44;p=android-x86%2Fpackages-apps-Settings.git

Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 4d7111b0e9  -s ours am: ccf6996623  -s ours" into oc-mr1-dev-plus-aosp
am: 47099cf173  -s ours

Change-Id: I70e2aea1799d8b38baa3a50818ac883b6bf37398
---

e079b45c81b5349b118a05dd71fc632409ce4f44