From: Bill Yi Date: Mon, 11 Jun 2018 19:24:25 +0000 (-0700) Subject: [automerger skipped] Import translations. DO NOT MERGE skipped: 9f043e5e58 skipped... X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2c56e9b54b8bcce3dec93585d396e9f183f0de96;p=android-x86%2Fframeworks-base.git [automerger skipped] Import translations. DO NOT MERGE skipped: 9f043e5e58 skipped: cc2c91ba39 am: b1615a6d90 -s ours Change-Id: I9f949a268c9c25c19c731269b3299b4ca2d7aa28 --- 2c56e9b54b8bcce3dec93585d396e9f183f0de96