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

Commit 643e5860 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Enable DISALLOW_DUPLICATE_FIELD_IN_SKELETON since U"

parents 1ab7ac7f 0d34d850

core/java/android/text/format/DateFormat.java

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ public class DateFormat { 
     * mean using 12-hour in some locales and, in this case, is duplicated as the 'a' field.

     */

    @ChangeId

    @EnabledSince(targetSdkVersion = Build.VERSION_CODES.CUR_DEVELOPMENT)

    @EnabledSince(targetSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE)

    static final long DISALLOW_DUPLICATE_FIELD_IN_SKELETON = 170233598L;



    /**