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

webrtc/api/java/src/org/webrtc/VideoTrack.java

Index: webrtc/api/java/src/org/webrtc/VideoTrack.java
diff --git a/webrtc/api/java/src/org/webrtc/VideoTrack.java b/webrtc/api/java/src/org/webrtc/VideoTrack.java
deleted file mode 100644
index a4ec8caf57e8291079cb1f51a75819e8b4d48ee2..0000000000000000000000000000000000000000
--- a/webrtc/api/java/src/org/webrtc/VideoTrack.java
+++ /dev/null
@@ -1,51 +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.LinkedList;
-
-/** Java version of VideoTrackInterface. */
-public class VideoTrack extends MediaStreamTrack {
-  private final LinkedList<VideoRenderer> renderers =
-      new LinkedList<VideoRenderer>();
-
-  public VideoTrack(long nativeTrack) {
-    super(nativeTrack);
-  }
-
-  public void addRenderer(VideoRenderer renderer) {
-    renderers.add(renderer);
-    nativeAddRenderer(nativeTrack, renderer.nativeVideoRenderer);
-  }
-
-  public void removeRenderer(VideoRenderer renderer) {
-    if (!renderers.remove(renderer)) {
-      return;
-    }
-    nativeRemoveRenderer(nativeTrack, renderer.nativeVideoRenderer);
-    renderer.dispose();
-  }
-
-  public void dispose() {
-    while (!renderers.isEmpty()) {
-      removeRenderer(renderers.getFirst());
-    }
-    super.dispose();
-  }
-
-  private static native void free(long nativeTrack);
-
-  private static native void nativeAddRenderer(
-      long nativeTrack, long nativeRenderer);
-
-  private static native void nativeRemoveRenderer(
-      long nativeTrack, long nativeRenderer);
-}