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:
99a1e50
fe84e1f
)
Merge "Visuals for Inline Reply"
author
Adrian Roos
<roosa@google.com>
Mon, 23 Nov 2015 22:19:09 +0000
(22:19 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Mon, 23 Nov 2015 22:19:09 +0000
(22:19 +0000)
1
2
core/java/android/app/Notification.java
patch
|
diff1
|
diff2
|
blob
|
history
core/res/res/values/symbols.xml
patch
|
diff1
|
diff2
|
blob
|
history
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
patch
|
diff1
|
diff2
|
blob
|
history
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/app/Notification.java
Simple merge
diff --cc
core/res/res/values/symbols.xml
Simple merge
diff --cc
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
Simple merge
diff --cc
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Simple merge