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:
4a40215
b42ec7e
)
Merge "Add null check in setSidebandStream" into oc-dev am: ebb1475d1a
author
Robert Shih
<robertshih@google.com>
Wed, 10 May 2017 03:36:29 +0000
(
03:36
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 10 May 2017 03:36:29 +0000
(
03:36
+0000)
am:
b42ec7ea29
Change-Id: Iab9c41d741e0ca62b024850fa02a2a63720c43f2
1
2
media/libstagefright/omx/1.0/WGraphicBufferProducer.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
media/libstagefright/omx/1.0/WGraphicBufferProducer.cpp
Simple merge