OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
86e5abf
ea5576c
)
DO NOT MERGE Don't leak `this` out of GraphicBufferSource ctor am: 6301f88251 am...
author
Robert Shih
<robertshih@google.com>
Thu, 25 May 2017 21:32:24 +0000
(21:32 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 25 May 2017 21:32:24 +0000
(21:32 +0000)
am:
ea5576c980
Change-Id: If951d6ed2633d5e2ceeb3fe96e32b98c2c06b482
1
2
media/libstagefright/omx/GraphicBufferSource.cpp
patch
|
diff1
|
diff2
|
blob
|
history
media/libstagefright/omx/OMXNodeInstance.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
media/libstagefright/omx/GraphicBufferSource.cpp
Simple merge
diff --cc
media/libstagefright/omx/OMXNodeInstance.cpp
Simple merge