OSDN Git Service

Merge "Settings app supports location settings injection" into klp-dev
authorTom O'Neill <tomo@google.com>
Wed, 14 Aug 2013 00:30:30 +0000 (00:30 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 14 Aug 2013 00:30:30 +0000 (00:30 +0000)
commitcabe7e821886f560e2bff7d2528069308458dc98
tree00b29b2232eab6bc2fa97773eac79e1e853affd0
parentcd3eb97ce57e9811cb7129d4d493a08480e9a56e
parente2921c9566e34fd95b864cca247ff71cf9b30752
Merge "Settings app supports location settings injection" into klp-dev
res/values/strings.xml