From: timhypeng <timhypeng@google.com>
Date: Fri, 11 May 2018 17:21:55 +0000 (-0700)
Subject: Merge "Add discoverable footer preference string when bluetooth is off" into pi-dev
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fe323a7359;p=android-x86%2Fpackages-apps-Settings.git

Merge "Add discoverable footer preference string when bluetooth is off" into pi-dev
am: 4017944d17

Change-Id: I7eefdbbc9ff9a1892b3309c4d284d2358d589b0f
---

fe323a7359bf8c66198afe56bf69a7311f8a6e6b