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)
commit7fb91855b05b312e45bfded72d48e0cffcee4a44
tree7a4c69385845921cb86ab33ad7c88daff6fb98b4
parent0e9cf8a723c3e03207e905e8e03303ec4b5526dc
parent9627a8ea151c1f27e5e9f34592c7b34fea3101c3
Merge "Show more settings and add restrictions/dialogs for secondary users" into jb-mr1-dev
res/values/strings.xml