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

webrtc/api/java/src/org/webrtc/RtpReceiver.java

Index: webrtc/api/java/src/org/webrtc/RtpReceiver.java
diff --git a/webrtc/api/java/src/org/webrtc/RtpReceiver.java b/webrtc/api/java/src/org/webrtc/RtpReceiver.java
deleted file mode 100644
index 1c4eef3115d5a845d66e5da285c4ab3da32bec52..0000000000000000000000000000000000000000
--- a/webrtc/api/java/src/org/webrtc/RtpReceiver.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Copyright 2015 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;
-
-/** Java wrapper for a C++ RtpReceiverInterface. */
-public class RtpReceiver {
-  final long nativeRtpReceiver;
-
-  private MediaStreamTrack cachedTrack;
-
-  public RtpReceiver(long nativeRtpReceiver) {
-    this.nativeRtpReceiver = nativeRtpReceiver;
-    long track = nativeGetTrack(nativeRtpReceiver);
-    // We can assume that an RtpReceiver always has an associated track.
-    cachedTrack = new MediaStreamTrack(track);
-  }
-
-  public MediaStreamTrack track() {
-    return cachedTrack;
-  }
-
-  public boolean setParameters(RtpParameters parameters) {
-    return nativeSetParameters(nativeRtpReceiver, parameters);
-  }
-
-  public RtpParameters getParameters() {
-    return nativeGetParameters(nativeRtpReceiver);
-  }
-
-  public String id() {
-    return nativeId(nativeRtpReceiver);
-  }
-
-  public void dispose() {
-    cachedTrack.dispose();
-    free(nativeRtpReceiver);
-  }
-
-  // This should increment the reference count of the track.
-  // Will be released in dispose().
-  private static native long nativeGetTrack(long nativeRtpReceiver);
-
-  private static native boolean nativeSetParameters(long nativeRtpReceiver,
-                                                    RtpParameters parameters);
-
-  private static native RtpParameters nativeGetParameters(long nativeRtpReceiver);
-
-  private static native String nativeId(long nativeRtpReceiver);
-
-  private static native void free(long nativeRtpReceiver);
-};