OSDN Git Service

Merge "Show more settings and add restrictions/dialogs for secondary users" into...
authorAmith Yamasani <yamasani@google.com>
Mon, 24 Sep 2012 01:47:19 +0000 (18:47 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 24 Sep 2012 01:47:20 +0000 (18:47 -0700)
1  2 
res/values/strings.xml

Simple merge