| commit | 169514fef68efa652a036dbe73745dc75005b947 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Thu Oct 04 22:25:20 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 04 22:25:20 2012 -0700 |
| tree | 8bf1678182f6271843144b900c31d1913d8ac951 | |
| parent | 8b14fda4f36c86eaa8b4c9e072398d61228a26d7 [diff] | |
| parent | 74ab4268f6881081e325c8acb6f2574dca7cdb66 [diff] |
am 74ab4268: am efd7b267: Merge "More userActivity() calls in keyguard" into jb-mr1-dev * commit '74ab4268f6881081e325c8acb6f2574dca7cdb66': More userActivity() calls in keyguard