OSDN Git Service

Merge "LocationSettings javadoc describes what's in the UI"
authorTom O'Neill <tomo@google.com>
Thu, 4 Jun 2015 16:28:20 +0000 (16:28 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 4 Jun 2015 16:28:21 +0000 (16:28 +0000)

Trivial merge