OSDN Git Service

Merge "Multi-user battery settings." into jb-mr1-dev
authorDianne Hackborn <hackbod@google.com>
Thu, 13 Sep 2012 17:36:13 +0000 (10:36 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 13 Sep 2012 17:36:14 +0000 (10:36 -0700)
1  2 
res/values/strings.xml

Simple merge