commit 643e58607214c78a8bd2bdce0201b5cc32d35a47
author Treehugger Robot <treehugger-gerrit@google.com> Fri Sep 16 11:54:08 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 16 11:54:08 2022 +0000
tree 49e91f5bb0bb7c4ac9cda8f293d6b5f3921ad42e
parent 1ab7ac7f56efa11c86b29eec4a57b597f64eb5fe
parent 0d34d850fda5dd63b53058fa618e7c66761014be

Merge "Enable DISALLOW_DUPLICATE_FIELD_IN_SKELETON since U"

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

diff --git a/core/java/android/text/format/DateFormat.java b/core/java/android/text/format/DateFormat.java
index 537dffc..d48d566 100755
--- a/core/java/android/text/format/DateFormat.java
+++ b/core/java/android/text/format/DateFormat.java
@@ -170,7 +170,7 @@
      * 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;
 
     /**