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