From: Bill Yi Date: Fri, 6 Apr 2018 20:52:13 +0000 (-0700) Subject: [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=aee045ac0888d3fad3bb900d418e839f9eeb61d0;p=android-x86%2Fframeworks-base.git [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 835e90b606 -s ours Change-Id: I82e97e426bcbe37538fb04363a9780297b1e912d --- aee045ac0888d3fad3bb900d418e839f9eeb61d0