am 2c159ec0: Merge change 2971 into donut

Merge commit '2c159ec05b8fc52166e22d7c4f49cf43d10b487b'

* commit '2c159ec05b8fc52166e22d7c4f49cf43d10b487b':
  Corrected the name of the native library the SynthProxy class loads (libttssynthproxy instead of libsynthproxy) to match the lib name from frameworks/base/tts/jni/Android.mk.

tts/java/android/tts/SynthProxy.java

@@ -120,7 +120,7 @@ public class SynthProxy {
     }
 
     static {
-        System.loadLibrary("synthproxy");
+        System.loadLibrary("ttssynthproxy");
     }
 
     private final static String TAG = "SynthProxy";