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:
e138ca8
6a2a5b5
)
Merge "NuPlayerDecoder: fail gracefully when input data can't be held in allocated...
author
Wei Jia
<wjia@google.com>
Tue, 6 Jun 2017 19:46:11 +0000
(19:46 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 6 Jun 2017 19:46:11 +0000
(19:46 +0000)
am:
6a2a5b5808
Change-Id: Ic443f079bcb1213921a3bf61a13dbfe83ce2a63e
1
2
media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
Simple merge