OSDN Git Service

Merge "Remove dead setRingerMode(mode, mask)"
authorGlenn Kasten <gkasten@google.com>
Fri, 20 Jan 2012 18:07:06 +0000 (10:07 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 20 Jan 2012 18:07:06 +0000 (10:07 -0800)
1  2 
include/media/AudioSystem.h
media/libmedia/AudioSystem.cpp
services/audioflinger/AudioPolicyService.cpp
services/audioflinger/AudioPolicyService.h

Simple merge
Simple merge