From: Bill Yi Date: Mon, 15 Oct 2018 10:34:58 +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=20642c19ec33c360747b32a901fd44d7d0c8bb4e;p=android-x86%2Fframeworks-base.git [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 15b8498906 -s ours Change-Id: I45ebb9332b5aa628d1fd4838642d1ef2083b7ab9 --- 20642c19ec33c360747b32a901fd44d7d0c8bb4e