resolved conflicts for merge of 85ce45e2 to master

Browse Source

Merge commit '85ce45e2' into manualmerge

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

Signed-off-by: Iliyan Malchev <malchev@google.com>

...

This commit is contained in:

Iliyan Malchev

2010-02-03 14:53:19 -08:00

parent cdbc47e396 52c16eb522

commit 7c63be3a8f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available