Iliyan Malchev 7c63be3a8f resolved conflicts for merge of 85ce45e2 to master
Merge commit '85ce45e2' into manualmerge

Conflicts:
	libaudio-qsd8k/AudioHardware.cpp
	libaudio-qsd8k/AudioHardware.h

Signed-off-by: Iliyan Malchev <malchev@google.com>
2010-02-03 14:53:19 -08:00
Description
No description provided
1.3 MiB
Languages
C++ 90.2%
Objective-C 4.6%
C 2.8%
Makefile 2.4%