OSDN Git Service

Merge "Add condition provider access to settings."
authorJohn Spurlock <jspurlock@google.com>
Wed, 30 Apr 2014 02:12:21 +0000 (02:12 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 30 Apr 2014 02:12:21 +0000 (02:12 +0000)
1  2 
res/values/strings.xml

Simple merge