From: Atanas Kirilov Date: Mon, 4 Jun 2018 23:09:33 +0000 (-0700) Subject: Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev am... X-Git-Tag: android-x86-9.0-r1~22^2~4^2 X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fpackages-apps-Settings.git;a=commitdiff_plain;h=2f38890832a475f18721d3e41349612da3897f7f Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev am: 9e626734bb am: 65db9c47b9 Change-Id: I86cff1a6b90fbf53738d76f26fee07637db7da95 --- 2f38890832a475f18721d3e41349612da3897f7f