From: Bill Yi Date: Mon, 2 Apr 2018 18:18:24 +0000 (+0000) Subject: [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1876333dc3a61a4223c02fecc3bdc5f21be5f9eb;p=android-x86%2Fframeworks-base.git [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 2b7c92eb4c -s ours Change-Id: I8c8079497c4c764bb16994624ad76857daa97e20 --- 1876333dc3a61a4223c02fecc3bdc5f21be5f9eb