From: Pavlin Radoslavov <pavlin@google.com>
Date: Sat, 10 Feb 2018 09:22:38 +0000 (+0000)
Subject: Merge "Use proper string formatting for the "Active device" string" am: f5848d0f4d
X-Git-Tag: android-x86-9.0-r1~93^2~1^2~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ac8aed2ce8c466c8e9dbba922a6506aebff9d943;p=android-x86%2Fpackages-apps-Settings.git

Merge "Use proper string formatting for the "Active device" string" am: f5848d0f4d
am: 8018f82e5a

Change-Id: Iaf745544ca349cb5a0193b4dd0e46bcc89ff4e0c
---

ac8aed2ce8c466c8e9dbba922a6506aebff9d943