commit | db5790d6e1add618f1e4f7e6993288c6b03b6f69 | [log] [tgz] |
---|---|---|
author | Adam Cohen <adamcohen@google.com> | Thu Nov 08 15:58:11 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 15:58:11 2012 -0800 |
tree | 9e89b12b3a7d1ef22069169f32a95074de348fd3 | |
parent | d772ff8287f6c2f0e2326e1787d23772ed60acb6 [diff] | |
parent | 5d92a50efd069a3056fdf94d2673f3934378d213 [diff] |
am 5d92a50e: am 06b29549: am 38515e9a: am c8ed8d32: Merge "Adding user activity when the challenge is slid down" into jb-mr1-lockscreen-dev * commit '5d92a50efd069a3056fdf94d2673f3934378d213': Adding user activity when the challenge is slid down