From: Bill Yi Date: Thu, 5 Apr 2018 23:24:00 +0000 (-0700) Subject: [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=32cab7934a4b0abe44f0a1af4213f7ecf8b63d59;p=android-x86%2Fpackages-apps-Settings.git [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 3da184f074 -s ours Change-Id: I4199238b803aa1841e096140e07c1faf4aacc274 --- 32cab7934a4b0abe44f0a1af4213f7ecf8b63d59