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:
ee60bc0
7def2ee
)
Merge "Fix keyboard focus in VR" into oc-dr1-dev am: 986995d481
author
Tarandeep Singh
<tarandeep@google.com>
Wed, 2 Aug 2017 23:04:58 +0000
(23:04 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 2 Aug 2017 23:04:58 +0000
(23:04 +0000)
am:
7def2eea97
Change-Id: I538777a295628827fc3052c58641cbb659afad20
1
2
core/java/android/service/wallpaper/WallpaperService.java
patch
|
diff1
|
diff2
|
blob
|
history
core/java/android/view/ViewRootImpl.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/vr/VrManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/wm/WindowManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/wm/WindowState.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/service/wallpaper/WallpaperService.java
Simple merge
diff --cc
core/java/android/view/ViewRootImpl.java
Simple merge
diff --cc
services/core/java/com/android/server/vr/VrManagerService.java
Simple merge
diff --cc
services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge
diff --cc
services/core/java/com/android/server/wm/WindowState.java
Simple merge