From: John Spurlock Date: Thu, 1 May 2014 19:17:59 +0000 (+0000) Subject: Merge "Settings preference for choosing long-term conditions." X-Git-Tag: android-x86-6.0-r1~2481 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1e2174da96fba2b01c3c573e0848f79bbd5a15b2;p=android-x86%2Fpackages-apps-Settings.git Merge "Settings preference for choosing long-term conditions." --- 1e2174da96fba2b01c3c573e0848f79bbd5a15b2