From: TreeHugger Robot Date: Sat, 3 Mar 2018 05:28:36 +0000 (+0000) Subject: Merge changes from topic "am-9b4b0f8c-4823-4712-936a-f4aafe519eff" into oc-dev X-Git-Tag: android-x86-9.0-r1~91^2~1^2^2~8^2~37 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=13ac18d299186b6732c408b0b746eca8dabf75dd;p=android-x86%2Fframeworks-base.git Merge changes from topic "am-9b4b0f8c-4823-4712-936a-f4aafe519eff" into oc-dev * changes: [automerger skipped] Import translations. DO NOT MERGE skipped: 7a217545ed skipped: b0046a8e4e [automerger skipped] Import translations. DO NOT MERGE skipped: 7a217545ed Import translations. DO NOT MERGE --- 13ac18d299186b6732c408b0b746eca8dabf75dd