OSDN Git Service

Merge "Add discoverable footer preference string when bluetooth is off" into pi-dev...
authortimhypeng <timhypeng@google.com>
Fri, 11 May 2018 17:32:40 +0000 (10:32 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 May 2018 17:32:40 +0000 (10:32 -0700)
commitb02c4a18fc3bdb3bfc8f48243c3fbe9825bab50e
treec82302493593869553c1f525be50c2cb8139d826
parentae2893db10cdd6e021ac44103ecf83d8b1595e06
parentfe323a7359bf8c66198afe56bf69a7311f8a6e6b
Merge "Add discoverable footer preference string when bluetooth is off" into pi-dev am: 4017944d17
am: fe323a7359

Change-Id: I97fe217535a8d9f8da756505c7b60662202a3867
res/values/strings.xml