From: Bill Yi <byi@google.com>
Date: Sun, 18 Aug 2019 07:16:04 +0000 (-0700)
Subject: [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b532faa7c992d6e95167a844d124ed90d49784dc;p=android-x86%2Fframeworks-base.git

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 4769e819e9 -s ours
am skip reason: subject contains skip directive

Change-Id: I28086d495911ad8df40e2e77bc888722864cec48
---

b532faa7c992d6e95167a844d124ed90d49784dc