From: TreeHugger Robot Date: Fri, 6 Jul 2018 02:45:57 +0000 (+0000) Subject: Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c1dc805861bef15447d843737682db50c86fa871;p=android-x86%2Fframeworks-base.git Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev * changes: [automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1 [automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec Import translations. DO NOT MERGE --- c1dc805861bef15447d843737682db50c86fa871