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:
a5d9241
1e79b0c
)
Merge "OMXNodeInstance: use a lock around OMX::freeNode" into oc-dev
author
Lajos Molnar
<lajos@google.com>
Tue, 10 Oct 2017 23:24:34 +0000
(23:24 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 10 Oct 2017 23:24:34 +0000
(23:24 +0000)
am:
1e79b0c156
Change-Id: I2ce31c4b8db21cf20975f9855215b48e3779915e
1
2
media/libstagefright/omx/OMXNodeInstance.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
media/libstagefright/omx/OMXNodeInstance.cpp
Simple merge