From: Bill Yi <byi@google.com>
Date: Fri, 6 Jul 2018 04:05:33 +0000 (-0700)
Subject: [automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a23f9ab73c0d108d353e74b2530d507b3a6d8bb7;p=android-x86%2Fframeworks-base.git

[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab am: b3bf111bd5  -s ours am: 4065ce8773  -s ours am: 03e1c5f227  -s ours am: 05968703a2  -s ours
am: 4a4b554061  -s ours

Change-Id: I91b22ce4464a7af4f3184a2ab47b89c318272b76
---

a23f9ab73c0d108d353e74b2530d507b3a6d8bb7