From: Tom O'Neill <tomo@google.com>
Date: Thu, 4 Jun 2015 16:28:20 +0000 (+0000)
Subject: Merge "LocationSettings javadoc describes what's in the UI"
X-Git-Tag: android-x86-7.1-r1~1235^2~350^2~4
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1542f9c7;p=android-x86%2Fpackages-apps-Settings.git

Merge "LocationSettings javadoc describes what's in the UI"
---

1542f9c7d30b808e2a9abc7b7f3d0510267ad2ad