OSDN Git Service
(root)
/
android-x86
/
packages-apps-Taskbar.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cb4ebc1
52d4d96
)
Merge branch 'temp-branch'
author
Braden Farmer
<farmerbb@gmail.com>
Sat, 16 Sep 2017 01:04:14 +0000
(19:04 -0600)
committer
Braden Farmer
<farmerbb@gmail.com>
Sat, 16 Sep 2017 01:04:14 +0000
(19:04 -0600)
1
2
app/src/main/java/com/farmerbb/taskbar/service/TaskbarService.java
patch
|
diff1
|
diff2
|
blob
|
history
app/src/main/java/com/farmerbb/taskbar/util/U.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
app/src/main/java/com/farmerbb/taskbar/service/TaskbarService.java
Simple merge
diff --cc
app/src/main/java/com/farmerbb/taskbar/util/U.java
Simple merge