From: Bill Yi Date: Tue, 16 Oct 2018 13:55:29 +0000 (-0700) Subject: [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 78d7d2... X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=692837570b0a1ba36d401fa5e09668d70cef1695;p=android-x86%2Fframeworks-base.git [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 78d7d26052 -s ours am: da862d5d20 -s ours Change-Id: Ia79877cc1e3c9c2f5d2291de95ace253afca37d1 --- 692837570b0a1ba36d401fa5e09668d70cef1695