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:
e048a21
ee8931e
)
Merge "Add uniqueId to Virtual Display and pass through to inputflinger (1/2)"
author
Santos Cordon
<santoscordon@google.com>
Thu, 11 May 2017 01:48:18 +0000
(
01:48
+0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 11 May 2017 01:48:26 +0000
(
01:48
+0000)
1
2
core/java/android/hardware/display/DisplayManager.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/ActivityStackSupervisor.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/hardware/display/DisplayManager.java
Simple merge
diff --cc
services/core/java/com/android/server/am/ActivityStackSupervisor.java
Simple merge