OSDN Git Service

Merge "Use audio_in_acoustics_t consistently"
authorGlenn Kasten <gkasten@google.com>
Fri, 3 Feb 2012 16:31:01 +0000 (08:31 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 3 Feb 2012 16:31:01 +0000 (08:31 -0800)
1  2 
media/libmedia/IAudioFlinger.cpp
services/audioflinger/AudioFlinger.cpp
services/audioflinger/AudioFlinger.h
services/audioflinger/AudioPolicyService.cpp
services/audioflinger/AudioPolicyService.h

Simple merge
Simple merge