OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91aae8b 28f1f5e)
am 28f1f5e6: Merge "Get basic keyguard working in new branch" into jb-mr1-lockscreen-dev
authorJim Miller <jaggies@google.com>
Fri, 26 Oct 2012 22:24:15 +0000 (15:24 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 26 Oct 2012 22:24:15 +0000 (15:24 -0700)
* commit '28f1f5e6f9a9f4a8a5e82fcb58c8dfadca7b5f93':
  Get basic keyguard working in new branch


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help