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

[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc am: 9204ce40e4  -s ours am: e45b804b65  -s ours am: d9d9d1daca  -s ours
am: 9f950537e4  -s ours

Change-Id: I14c71ce82a5d857ef9bdabb7015c582db1dcb3f0
---

64b9fb51ecc98102967b9b34704ce42c89e62957