OSDN Git Service

Merge "Settings preference for choosing long-term conditions."
authorJohn Spurlock <jspurlock@google.com>
Thu, 1 May 2014 19:17:59 +0000 (19:17 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 1 May 2014 19:17:59 +0000 (19:17 +0000)
1  2 
res/values/strings.xml

Simple merge