From: Bill Yi <byi@google.com>
Date: Mon, 16 Apr 2018 20:38:59 +0000 (-0700)
Subject: [automerger skipped] [automerger] Import translations. DO NOT MERGE am: c7fe3a5972... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e6013c722f;p=android-x86%2Fframeworks-base.git

[automerger skipped] [automerger] Import translations. DO NOT MERGE am: c7fe3a5972 skipped: 9a64c59288 am: 67841fe1e6  -s ours am: 97ddc81da4  -s ours am: 3b3379f16a  -s ours
am: 8d9df4b042  -s ours

Change-Id: I14f58ca53b0c9e94c34d727f7f20c13a8e255843
---

e6013c722f4f36e607a4885857d638dc23a93453