am 3a87a911: am b1461fb4: Merge change 23542 into eclair

Merge commit '3a87a91176f0f7bb58c7054a8909a19320c98195'

* commit '3a87a91176f0f7bb58c7054a8909a19320c98195':
  Modify the gain after filtering to prevent TTS clipping in en-US.

packages/TtsService/jni/android_tts_SynthProxy.cpp

@@ -41,7 +41,7 @@
 #define FILTER_LOWSHELF_ATTENUATION -18.0f // in dB
 #define FILTER_TRANSITION_FREQ 1100.0f     // in Hz
 #define FILTER_SHELF_SLOPE 1.0f            // Q
-#define FILTER_GAIN 6.0f // linear gain
+#define FILTER_GAIN 5.5f // linear gain
 // such a huge gain is justified by how much energy in the low frequencies is "wasted" at the output
 // of the synthesis. The low shelving filter removes it, leaving room for amplification.