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:
b50a0cd
a686345
)
DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s
author
Erik Wolsheimer
<ewol@google.com>
Tue, 2 May 2017 15:54:40 +0000
(15:54 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 2 May 2017 15:54:40 +0000
(15:54 +0000)
am:
a686345759
Change-Id: I0598c6210dbf0d0447c31112419a2fee829037be
1
2
services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
Simple merge