From: Bill Yi Date: Fri, 20 Oct 2017 16:34:35 +0000 (+0000) Subject: Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 9fe4ca37b9 ... X-Git-Tag: android-x86-9.0-r1~350^2^2~12 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3898a06ae064dfe271bde888c7f4ca8319ba4fee;p=android-x86%2Fframeworks-base.git Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 9fe4ca37b9 -s ours am: ef30f73d5a -s ours Change-Id: Id60b39fadb55f2a8e38d5c803cb88df5e0def573 --- 3898a06ae064dfe271bde888c7f4ca8319ba4fee