OSDN Git Service

Merge "Get basic keyguard working in new branch" into jb-mr1-lockscreen-dev
authorJim Miller <jaggies@google.com>
Sat, 20 Oct 2012 02:19:24 +0000 (19:19 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 20 Oct 2012 02:19:24 +0000 (19:19 -0700)
commit28f1f5e6f9a9f4a8a5e82fcb58c8dfadca7b5f93
treef061c753d2a376cc700f8ceb3acd40a071b5778f
parent3f8794dfda9dd025a419ad19225bd4f227b297d3
parent838906b165e4d3cb2c512b2db344aa50cb5d4751
Merge "Get basic keyguard working in new branch" into jb-mr1-lockscreen-dev