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:
7208c05
19e3e06
)
Merge "BQ: Modify consumer buffer count interfaces"
author
Pablo Ceballos
<pceballos@google.com>
Wed, 16 Sep 2015 20:19:59 +0000
(20:19 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Wed, 16 Sep 2015 20:19:59 +0000
(20:19 +0000)
1
2
libs/gui/GLConsumer.cpp
patch
|
diff1
|
diff2
|
blob
|
history
libs/gui/tests/BufferQueue_test.cpp
patch
|
diff1
|
diff2
|
blob
|
history
services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
patch
|
diff1
|
diff2
|
blob
|
history
services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
libs/gui/GLConsumer.cpp
Simple merge
diff --cc
libs/gui/tests/BufferQueue_test.cpp
Simple merge
diff --cc
services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
Simple merge
diff --cc
services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp
Simple merge