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

webrtc/api/java/src/org/webrtc/SessionDescription.java

Index: webrtc/api/java/src/org/webrtc/SessionDescription.java
diff --git a/webrtc/api/java/src/org/webrtc/SessionDescription.java b/webrtc/api/java/src/org/webrtc/SessionDescription.java
deleted file mode 100644
index f6dd3612bcd28cd9c9aa33609cc4133c5425042b..0000000000000000000000000000000000000000
--- a/webrtc/api/java/src/org/webrtc/SessionDescription.java
+++ /dev/null
@@ -1,40 +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;
-
-/**
- * Description of an RFC 4566 Session.
- * SDPs are passed as serialized Strings in Java-land and are materialized
- * to SessionDescriptionInterface as appropriate in the JNI layer.
- */
-public class SessionDescription {
-  /** Java-land enum version of SessionDescriptionInterface's type() string. */
-  public static enum Type {
-    OFFER, PRANSWER, ANSWER;
-
-    public String canonicalForm() {
-      return name().toLowerCase();
-    }
-
-    public static Type fromCanonicalForm(String canonical) {
-      return Type.valueOf(Type.class, canonical.toUpperCase());
-    }
-  }
-
-  public final Type type;
-  public final String description;
-
-  public SessionDescription(Type type, String description) {
-    this.type = type;
-    this.description = description;
-  }
-}