OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
74e52ba
ad59d3a
)
Merge "Fix concurrent writes to the hardware composer" into oc-dr1-dev am: 87cd11513f
author
Steven Thomas
<steventhomas@google.com>
Tue, 18 Jul 2017 00:25:24 +0000
(
00:25
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 18 Jul 2017 00:25:24 +0000
(
00:25
+0000)
am:
ad59d3ad0b
Change-Id: Ib0e1c3a2804d2b77c7f41adcca65b4de926ae24b
1
2
services/surfaceflinger/SurfaceFlinger.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/surfaceflinger/SurfaceFlinger.cpp
Simple merge