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

Commit 15390ccf authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Enable DISALLOW_DUPLICATE_FIELD_IN_SKELETON since U" am: 643e5860 am:... 

Merge "Enable DISALLOW_DUPLICATE_FIELD_IN_SKELETON since U" am: 643e5860 am: de4ea8f3 am: e47e8ec3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2216581



Change-Id: Ie4bdd8bc8c8ecd9d1d6bda75326191ae158be7e6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f1f8a751 e47e8ec3

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;



    /**