am 940ad4aa: Merge "Make AudioGroup.add locale safe"

* commit '940ad4aaef6ad27a2a214559100a18100b2b3b24':
  Make AudioGroup.add locale safe

voip/java/android/net/rtp/AudioGroup.java

@@ -19,6 +19,7 @@ package android.net.rtp;
 import android.media.AudioManager;
 
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 /**
@@ -146,7 +147,7 @@ public class AudioGroup {
         if (!mStreams.containsKey(stream)) {
             try {
                 AudioCodec codec = stream.getCodec();
-                String codecSpec = String.format("%d %s %s", codec.type,
+                String codecSpec = String.format(Locale.US, "%d %s %s", codec.type,
                         codec.rtpmap, codec.fmtp);
                 int id = nativeAdd(stream.getMode(), stream.getSocket(),
                         stream.getRemoteAddress().getHostAddress(),