OSDN Git Service

am 7fb91855: Merge "Show more settings and add restrictions/dialogs for secondary...
authorAmith Yamasani <yamasani@google.com>
Mon, 24 Sep 2012 16:26:01 +0000 (09:26 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 24 Sep 2012 16:26:01 +0000 (09:26 -0700)
commit16a6fd4bb43927bdabe3ed7985b5efedaaf659e4
tree7a4c69385845921cb86ab33ad7c88daff6fb98b4
parentc912f5c6ab48b6ba81a79af561b571faa6396526
parent7fb91855b05b312e45bfded72d48e0cffcee4a44
am 7fb91855: Merge "Show more settings and add restrictions/dialogs for secondary users" into jb-mr1-dev

* commit '7fb91855b05b312e45bfded72d48e0cffcee4a44':
  Show more settings and add restrictions/dialogs for secondary users