am 01af0f21: Merge commit \'1542f9c7\' into manualmerge

* commit '01af0f21a9bbccb8dfda5fe4a6621a7233a5d05f':
  LocationSettings javadoc describes what's in the UI
This commit is contained in:
Tom O'Neill
2015-06-04 19:11:28 +00:00
committed by Android Git Automerger

Diff Content Not Available