OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 23af77a 02e8574)
resolved conflicts for merge of 02e85744 to master
authorElliott Hughes <enh@google.com>
Fri, 25 Apr 2014 00:18:10 +0000 (17:18 -0700)
committerElliott Hughes <enh@google.com>
Fri, 25 Apr 2014 00:18:10 +0000 (17:18 -0700)
commitccec5f0def723baa6c4c80bd7ff1971a32c9d8c3
tree77d9d3a96daacf86575bb486ad5ea214e003a90atree | snapshot
parent23af77a3cd1febc740d885ff03ead09837df269ccommit | diff
parent02e857441fcc27134f335aee659d553641a2b2abcommit | diff
resolved conflicts for merge of 02e85744 to master

Change-Id: Id4c0ecfedc7ec4ff4b76331be025817445a652e9
packages/Keyguard/src/com/android/keyguard/KeyguardMessageArea.java diff1 | diff2 | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help