Combine webrtc/api/java/android and webrtc/api/java/src.

webrtc/api/java/src/org/webrtc/RtpParameters.java

Index: webrtc/api/java/src/org/webrtc/RtpParameters.java
diff --git a/webrtc/api/java/src/org/webrtc/RtpParameters.java b/webrtc/api/java/src/org/webrtc/RtpParameters.java
deleted file mode 100644
index 4aa10fbce63c88ca67630622120d60c6e8745b25..0000000000000000000000000000000000000000
--- a/webrtc/api/java/src/org/webrtc/RtpParameters.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *  Copyright 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-package org.webrtc;
-
-import java.util.List;
-import java.util.LinkedList;
-
-/**
- * The parameters for an {@code RtpSender}, as defined in
- * http://w3c.github.io/webrtc-pc/#rtcrtpsender-interface.
- */
-public class RtpParameters {
-  public static class Encoding {
-    public boolean active = true;
-    // A null value means "no maximum bitrate".
-    public Integer maxBitrateBps;
-  }
-
-  public static class Codec {
-    int payloadType;
-    String mimeType;
-    int clockRate;
-    int channels = 1;
-  }
-
-  public final LinkedList<Encoding> encodings;
-  public final LinkedList<Codec> codecs;
-
-  public RtpParameters() {
-    encodings = new LinkedList<Encoding>();
-    codecs = new LinkedList<Codec>();
-  }
-}