From: TreeHugger Robot Date: Thu, 17 May 2018 23:23:10 +0000 (+0000) Subject: Merge changes from topic "am-99e79364-ab71-4d96-8a34-000c07c66d3e" into oc-dev X-Git-Tag: android-x86-9.0-r1~91^2~1^2^2~7^2~1 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=abf0ff542a;p=android-x86%2Fframeworks-base.git Merge changes from topic "am-99e79364-ab71-4d96-8a34-000c07c66d3e" into oc-dev * changes: [automerger skipped] Import translations. DO NOT MERGE skipped: c2a85c8927 skipped: 43bd9fa8b2 [automerger skipped] Import translations. DO NOT MERGE skipped: c2a85c8927 Import translations. DO NOT MERGE --- abf0ff542a57b19bd83182249475b9bcd3fca2bc