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:
c2776e7
73a7e98
)
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-mr1-dev am: 60719598d5 am...
author
Lajos Molnar
<lajos@google.com>
Thu, 19 Oct 2017 23:15:15 +0000
(23:15 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 19 Oct 2017 23:15:15 +0000
(23:15 +0000)
am:
73a7e98790
Change-Id: Iae94781121218aaa0d22666bb88e367ad188344e
1
2
media/libstagefright/omx/OMXNodeInstance.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
media/libstagefright/omx/OMXNodeInstance.cpp
Simple merge