OSDN Git Service

Merge "DevicePolicyManager per user" into jb-mr1-dev
authorAmith Yamasani <yamasani@google.com>
Wed, 19 Sep 2012 03:00:44 +0000 (20:00 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 19 Sep 2012 03:00:44 +0000 (20:00 -0700)
commit4adb9d34162b109db3c67e352ad50c76dc7f2d45
tree207abd56cd7df4ceeca3b9ed79b4bffca7ece163
parent2d95a33dc3a463b197d4597b38f5ae124de25017
parent599dd7ce9adf8ca067cefb0b191a5ac20ec35a79
Merge "DevicePolicyManager per user" into jb-mr1-dev
policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java