OSDN Git Service

Merge "Adding user activity when the challenge is slid down" into jb-mr1-lockscreen-dev
authorAdam Cohen <adamcohen@google.com>
Thu, 8 Nov 2012 09:03:49 +0000 (01:03 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 8 Nov 2012 09:03:50 +0000 (01:03 -0800)
commitc8ed8d32603d21e1af9a682cc5f1655d2388cfba
tree6b3198d9ba351ce0e0dbee3796686f7d5e0735bd
parente1a473b0d4d56f4258fc4c6ab4c9d4d0fe3fd3cc
parent08c83ef48880b98ec45dd83867a29852160a96eb
Merge "Adding user activity when the challenge is slid down" into jb-mr1-lockscreen-dev
policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewStateManager.java