From: Android Build Merger (Role) Date: Fri, 26 Jan 2018 01:38:20 +0000 (+0000) Subject: [automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:... X-Git-Tag: android-x86-9.0-r1~241^2~102^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b8bbb9d903b7f8c850178a66d389ba87fa191e21;p=android-x86%2Fframeworks-base.git [automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 41ee2787b4 -s ours skipped: 705235ca51 am: e15cb623db -s ours am: 8289005e10 -s ours am: e158633931 -s ours am: b2eb89daf5 -s ours Change-Id: Iea7ed535f395da6ce821131e7b846b029b220526 --- b8bbb9d903b7f8c850178a66d389ba87fa191e21