Merge commit '85ce45e2' into manualmerge Conflicts: libaudio-qsd8k/AudioHardware.cpp libaudio-qsd8k/AudioHardware.h Signed-off-by: Iliyan Malchev <malchev@google.com>
Description
No description provided
Languages
C++
90.2%
Objective-C
4.6%
C
2.8%
Makefile
2.4%