diff options
| author | Ying Wang <wangying@google.com> | 2014-05-08 13:48:00 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-05-08 13:48:00 -0700 |
| commit | 49f095546d047b52c5070229bbee0c3f27548256 (patch) | |
| tree | e8655eaaac3236025d96de19f86ad029aa5ed836 /media/libeffects/downmix/EffectDownmix.c | |
| parent | 96b292fd3c76f9af155ee6f7a8559258eeedc6fd (diff) | |
| parent | cf79c7a576837d8bccecc80612a1f6f30bb328a8 (diff) | |
| download | frameworks_av-49f095546d047b52c5070229bbee0c3f27548256.zip frameworks_av-49f095546d047b52c5070229bbee0c3f27548256.tar.gz frameworks_av-49f095546d047b52c5070229bbee0c3f27548256.tar.bz2 | |
resolved conflicts for merge of cf79c7a5 to master
Change-Id: Ic4e75541193f733f477cfa4a2a87cce4c9e64f45
Diffstat (limited to 'media/libeffects/downmix/EffectDownmix.c')
0 files changed, 0 insertions, 0 deletions