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:
52cfea9
55427a6
)
Merge \"Only use one SurfaceControlWithBackground per AppToken.\" into nyc-dev
author
Robert Carr
<racarr@google.com>
Wed, 29 Jun 2016 03:33:24 +0000
(
03:33
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 29 Jun 2016 03:33:24 +0000
(
03:33
+0000)
am:
55427a6650
Change-Id: I8f4eae6fe2ab09cd0b14473cba7d4dbbc42dc469
1
2
services/core/java/com/android/server/wm/AppWindowToken.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/wm/WindowSurfaceController.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/wm/AppWindowToken.java
Simple merge
diff --cc
services/core/java/com/android/server/wm/WindowSurfaceController.java
Simple merge
OSDN Git Service
