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:
fa0b15c
1f7d807
)
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp...
author
Ricardo Garcia
<rago@google.com>
Wed, 7 Jun 2017 13:32:43 +0000
(13:32 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 7 Jun 2017 13:32:43 +0000
(13:32 +0000)
am:
1f7d80772c
Change-Id: I7a978b70b1330b619ac0ed46f3c191912ce0ffd1
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