From: TreeHugger Robot Date: Mon, 11 Jun 2018 18:03:31 +0000 (+0000) Subject: Merge changes from topic "am-84e9fe64-a976-466c-a8d7-d25febc3ff42" into oc-dev X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5b882b9dd79c9d8c036b77e837f0ce8d9832767f;p=android-x86%2Fframeworks-base.git Merge changes from topic "am-84e9fe64-a976-466c-a8d7-d25febc3ff42" into oc-dev * changes: [automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d skipped: ab4ca0c33d [automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d Import translations. DO NOT MERGE --- 5b882b9dd79c9d8c036b77e837f0ce8d9832767f