OSDN Git Service

resolved conflicts for merge of cf79c7a5 to master
authorYing Wang <wangying@google.com>
Thu, 8 May 2014 20:48:00 +0000 (13:48 -0700)
committerYing Wang <wangying@google.com>
Thu, 8 May 2014 20:48:00 +0000 (13:48 -0700)
commit49f095546d047b52c5070229bbee0c3f27548256
treee8655eaaac3236025d96de19f86ad029aa5ed836
parent96b292fd3c76f9af155ee6f7a8559258eeedc6fd
parentcf79c7a576837d8bccecc80612a1f6f30bb328a8
resolved conflicts for merge of cf79c7a5 to master

Change-Id: Ic4e75541193f733f477cfa4a2a87cce4c9e64f45
media/libeffects/downmix/Android.mk
media/libeffects/preprocessing/Android.mk