Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61c45cbd authored by Conrad Chen's avatar Conrad Chen Committed by android-build-merger
Browse files

Merge "TIF: fix javadoc of recorded programs" into oc-dev am: a16d465a 

am: 790c4fbd

Change-Id: I8b4d61e25c5b0ddd80261def329587fb1cf82b32
parents a73eb1a7 790c4fbd

media/java/android/media/tv/TvContract.java

+0 −2
Original line number Diff line number Diff line
@@ -2745,8 +2745,6 @@ public final class TvContract { 
         *

         * <p>This is a part of the channel URI and matches to {@link BaseColumns#_ID}.

         *

         * <p>This is a required field.

         *

         * <p>Type: INTEGER (long)

         */

        public static final String COLUMN_CHANNEL_ID = "channel_id";