diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Player.java b/library/core/src/main/java/com/google/android/exoplayer2/Player.java
index a120ab1305..d4b965dbd6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Player.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Player.java
@@ -144,13 +144,13 @@ public interface Player {
   interface VideoComponent {
 
     /**
-     * Sets the {@link @VideoScalingMode}.
+     * Sets the {@link VideoScalingMode}.
      *
-     * @param videoScalingMode The {@link @VideoScalingMode}.
+     * @param videoScalingMode The {@link VideoScalingMode}.
      */
     void setVideoScalingMode(@VideoScalingMode int videoScalingMode);
 
-    /** Returns the {@link @VideoScalingMode}. */
+    /** Returns the {@link VideoScalingMode}. */
     @VideoScalingMode
     int getVideoScalingMode();
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Log.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Log.java
index f2dd54af12..6a1e686dec 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/Log.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Log.java
@@ -75,14 +75,14 @@ public final class Log {
     Log.logStackTraces = logStackTraces;
   }
 
-  /** @see android.util.Log#d(String, String). */
+  /** @see android.util.Log#d(String, String) */
   public static void d(String tag, String message) {
     if (logLevel == LOG_LEVEL_ALL) {
       android.util.Log.d(tag, message);
     }
   }
 
-  /** @see android.util.Log#d(String, String, Throwable). */
+  /** @see android.util.Log#d(String, String, Throwable) */
   public static void d(String tag, String message, @Nullable Throwable throwable) {
     if (!logStackTraces) {
       d(tag, appendThrowableMessage(message, throwable));
@@ -92,14 +92,14 @@ public final class Log {
     }
   }
 
-  /** @see android.util.Log#i(String, String). */
+  /** @see android.util.Log#i(String, String) */
   public static void i(String tag, String message) {
     if (logLevel <= LOG_LEVEL_INFO) {
       android.util.Log.i(tag, message);
     }
   }
 
-  /** @see android.util.Log#i(String, String, Throwable). */
+  /** @see android.util.Log#i(String, String, Throwable) */
   public static void i(String tag, String message, @Nullable Throwable throwable) {
     if (!logStackTraces) {
       i(tag, appendThrowableMessage(message, throwable));
@@ -109,14 +109,14 @@ public final class Log {
     }
   }
 
-  /** @see android.util.Log#w(String, String). */
+  /** @see android.util.Log#w(String, String) */
   public static void w(String tag, String message) {
     if (logLevel <= LOG_LEVEL_WARNING) {
       android.util.Log.w(tag, message);
     }
   }
 
-  /** @see android.util.Log#w(String, String, Throwable). */
+  /** @see android.util.Log#w(String, String, Throwable) */
   public static void w(String tag, String message, @Nullable Throwable throwable) {
     if (!logStackTraces) {
       w(tag, appendThrowableMessage(message, throwable));
@@ -126,14 +126,14 @@ public final class Log {
     }
   }
 
-  /** @see android.util.Log#e(String, String). */
+  /** @see android.util.Log#e(String, String) */
   public static void e(String tag, String message) {
     if (logLevel <= LOG_LEVEL_ERROR) {
       android.util.Log.e(tag, message);
     }
   }
 
-  /** @see android.util.Log#e(String, String, Throwable). */
+  /** @see android.util.Log#e(String, String, Throwable) */
   public static void e(String tag, String message, @Nullable Throwable throwable) {
     if (!logStackTraces) {
       e(tag, appendThrowableMessage(message, throwable));
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/Projection.java b/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/Projection.java
index 3a585ccd64..0a9d04bf0f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/Projection.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/Projection.java
@@ -59,9 +59,9 @@ public final class Projection {
   /**
    * Generates an equirectangular projection.
    *
-   * @param radius Size of the sphere. Must be > 0.
-   * @param latitudes Number of rows that make up the sphere. Must be >= 1.
-   * @param longitudes Number of columns that make up the sphere. Must be >= 1.
+   * @param radius Size of the sphere. Must be &gt; 0.
+   * @param latitudes Number of rows that make up the sphere. Must be &gt;= 1.
+   * @param longitudes Number of columns that make up the sphere. Must be &gt;= 1.
    * @param verticalFovDegrees Total latitudinal degrees that are covered by the sphere. Must be in
    *     (0, 180].
    * @param horizontalFovDegrees Total longitudinal degrees that are covered by the sphere.Must be