OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d753bf2 e143e58)
am e143e58c: Merge "Move majority of security-related logic from KeyguardHostView...
authorJim Miller <jaggies@google.com>
Tue, 28 Jan 2014 23:15:17 +0000 (15:15 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 Jan 2014 23:15:17 +0000 (15:15 -0800)
* commit 'e143e58cfddac03bf7427eca2951c8ce3afc5abc':
  Move majority of security-related logic from KeyguardHostView to KeyguardSecurityContainer.


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