OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4e678ff
27267d6
)
Merge "Add animation for fingerprint error state" into mnc-dev
author
Jorim Jaggi
<jjaggi@google.com>
Tue, 28 Apr 2015 23:01:13 +0000
(23:01 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 28 Apr 2015 23:01:14 +0000
(23:01 +0000)
1
2
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
Simple merge