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:
54f81e8
0ef6d9c
)
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp...
author
Ricardo Garcia
<rago@google.com>
Wed, 7 Jun 2017 13:27:12 +0000
(13:27 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 7 Jun 2017 13:27:12 +0000
(13:27 +0000)
am:
0ef6d9c121
Change-Id: I420ab9888c2b542ca66fbb65fd2bf7ea7ff3bb16
1
2
media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
Simple merge