OSDN Git Service

Merge "Making sure the sticky widget logic works with music" into jb-mr1-lockscreen-dev
authorAdam Cohen <adamcohen@google.com>
Tue, 6 Nov 2012 21:40:29 +0000 (13:40 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 6 Nov 2012 21:40:30 +0000 (13:40 -0800)
commit7741e6209ab4c6425ee4156631f54fe9bfce5fc3
treeb1c71c093caed8c50cd3e848142904f59eacd5ff
parent0e1608c0277155c49f78a0f6980e5c5cb9afc0b8
parentd6f8960b68c14e7946ff8f8286c484c28296ae39
Merge "Making sure the sticky widget logic works with music" 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