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:
14acc52
50ba991
)
Merge "Multi-user and WallpaperColors" into oc-mr1-dev
author
Lucas Dupin
<dupin@google.com>
Thu, 3 Aug 2017 16:23:41 +0000
(16:23 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 3 Aug 2017 16:23:41 +0000
(16:23 +0000)
1
2
core/java/android/service/wallpaper/WallpaperService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/service/wallpaper/WallpaperService.java
Simple merge