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)
1  2 
res/values/strings.xml

Simple merge