From: TreeHugger Robot Date: Thu, 25 Jan 2018 18:48:29 +0000 (+0000) Subject: Merge changes from topic "am-37557a04-fa85-46fe-a499-4a0280811f3e" into oc-dev X-Git-Tag: android-x86-9.0-r1~91^2~1^2^2~8^2~85 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bcf3392856b353f2b57569f2e0b0ebf5428b6db0;p=android-x86%2Fframeworks-base.git Merge changes from topic "am-37557a04-fa85-46fe-a499-4a0280811f3e" into oc-dev * changes: [automerger skipped] Import translations. DO NOT MERGE skipped: 39a33e2ffb skipped: 2e4c69a707 [automerger skipped] Import translations. DO NOT MERGE skipped: 39a33e2ffb Import translations. DO NOT MERGE --- bcf3392856b353f2b57569f2e0b0ebf5428b6db0