From bf95592b2c7f1998b676b0fe5c21af3ee9fbe907 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Fri, 19 Sep 2014 18:30:21 +0100
Subject: [PATCH] Remove unused import. Tweak documentation.

---
 .../com/google/android/exoplayer/util/ManifestFetcher.java     | 2 --
 .../java/com/google/android/exoplayer/util/ManifestParser.java | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/library/src/main/java/com/google/android/exoplayer/util/ManifestFetcher.java b/library/src/main/java/com/google/android/exoplayer/util/ManifestFetcher.java
index 1616429ca1..804b1240e7 100644
--- a/library/src/main/java/com/google/android/exoplayer/util/ManifestFetcher.java
+++ b/library/src/main/java/com/google/android/exoplayer/util/ManifestFetcher.java
@@ -15,8 +15,6 @@
  */
 package com.google.android.exoplayer.util;
 
-import com.google.android.exoplayer.C;
-
 import android.net.Uri;
 import android.os.AsyncTask;
 
diff --git a/library/src/main/java/com/google/android/exoplayer/util/ManifestParser.java b/library/src/main/java/com/google/android/exoplayer/util/ManifestParser.java
index d3f1fab1e7..ba997a9f77 100644
--- a/library/src/main/java/com/google/android/exoplayer/util/ManifestParser.java
+++ b/library/src/main/java/com/google/android/exoplayer/util/ManifestParser.java
@@ -33,7 +33,8 @@ public interface ManifestParser<T> {
    * Parses a manifest from an {@link InputStream}.
    *
    * @param inputStream The input stream to consume.
-   * @param inputEncoding The encoding of the input stream.
+   * @param inputEncoding The encoding of the input stream. May be null if the input encoding is
+   *     unknown.
    * @param contentId The content id to which the manifest corresponds. May be null.
    * @param baseUri If the manifest contains relative uris, this is the uri they are relative to.
    *     May be null.