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:
e4d1222
90ad7d5
)
Merge "Fix jank when switching themes" into oc-dr1-dev am: a74f575ff9
author
Lucas Dupin
<dupin@google.com>
Sat, 22 Jul 2017 05:00:17 +0000
(
05:00
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Sat, 22 Jul 2017 05:00:17 +0000
(
05:00
+0000)
am:
90ad7d538f
Change-Id: I524cc9f1c547b85dff3e726082aba52e255e9ccc
1
2
packages/SystemUI/AndroidManifest.xml
patch
|
diff1
|
diff2
|
blob
|
history
packages/SystemUI/res/values/styles.xml
patch
|
diff1
|
diff2
|
blob
|
history
packages/SystemUI/src/com/android/systemui/SystemUIApplication.java
patch
|
diff1
|
diff2
|
blob
|
history
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
packages/SystemUI/AndroidManifest.xml
Simple merge
diff --cc
packages/SystemUI/res/values/styles.xml
Simple merge
diff --cc
packages/SystemUI/src/com/android/systemui/SystemUIApplication.java
Simple merge
diff --cc
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
Simple merge