OSDN Git Service

am 74ab4268: am efd7b267: Merge "More userActivity() calls in keyguard" into jb-mr1-dev
authorJim Miller <jaggies@google.com>
Fri, 5 Oct 2012 05:25:20 +0000 (22:25 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Oct 2012 05:25:20 +0000 (22:25 -0700)
* commit '74ab4268f6881081e325c8acb6f2574dca7cdb66':
  More userActivity() calls in keyguard


Trivial merge