OSDN Git Service

am 7fb91855: Merge "Show more settings and add restrictions/dialogs for secondary...
authorAmith Yamasani <yamasani@google.com>
Mon, 24 Sep 2012 15:32:09 +0000 (08:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 24 Sep 2012 15:32:09 +0000 (08:32 -0700)
commit8d1e4bef6f5d1b0de61d95260b1e45167b775004
tree5952a382e363a1785d5502acc47b7af11c416845
parentbbd5d2016b506c3b47512cf980edb5d35c0993c6
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