commit 5ab9378c65dd32b55106a9127e8be1b90c7d5519
author The Android Automerger <android-build@android.com> Sat Jun 16 06:59:10 2012 -0700
committer The Android Automerger <android-build@android.com> Sat Jun 16 06:59:10 2012 -0700
tree 2c1c5c131d982b621bc20485358293fe7040cb55
parent 9bfb004047c68179c82d1f6aaa8f061a88060a64
parent 9112918771623a6d2d5b1622f95fd715d4dee4b3

merge in jb-release history after reset to jb-dev

libaudio/audio_policy.conf

diff --git a/libaudio/audio_policy.conf b/libaudio/audio_policy.conf
index 8525ec3..5d9a582 100644
--- a/libaudio/audio_policy.conf
+++ b/libaudio/audio_policy.conf
@@ -32,7 +32,7 @@
     }
     inputs {
       primary {
-        sampling_rates 8000|11025|16000|22050|32000|44100|48000
+        sampling_rates 8000|11025|12000|16000|22050|32000|44100|48000
         channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO
         formats AUDIO_FORMAT_PCM_16_BIT
         devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET|AUDIO_DEVICE_IN_WIRED_HEADSET