From: Bill Yi Date: Mon, 15 Oct 2018 04:29:25 +0000 (-0700) Subject: [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8bac3281296d2d153c280f44986f8c4418faf95d;p=android-x86%2Fframeworks-base.git [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: a8c3ce2984 -s ours Change-Id: I078bc5add74d080d737218eaf694b3a27d5d9c2d --- 8bac3281296d2d153c280f44986f8c4418faf95d