From: Bill Yi <byi@google.com>
Date: Mon, 18 Jun 2018 06:50:41 +0000 (-0700)
Subject: [automerger skipped] Import translations. DO NOT MERGE skipped: cbc81e618d skipped... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=db9728b756;p=android-x86%2Fframeworks-base.git

[automerger skipped] Import translations. DO NOT MERGE skipped: cbc81e618d skipped: 693ad9800b am: cb1a10f5b6  -s ours am: d996012ef5  -s ours am: 97ee183747  -s ours
am: 15123e0230  -s ours

Change-Id: I1f7790c7a09b36424a524fa3010dd2b6fe43fc1e
---

db9728b756f6f682c818093f1f2e2587d26ff1e4