Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enable DISALLOW_DUPLICATE_FIELD_IN_SKELETON since U" am: 643e586072

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

Change-Id: I685a06987da1a3e4cd3c61934b8e5cc30c4a69a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-09-16 12:16:44 +00:00
committed by Automerger Merge Worker
parent 1d74b8207b 643e586072
commit de4ea8f38b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/text/format/DateFormat.java
View File

@@ -170,7 +170,7 @@ public class DateFormat {
* mean using 12-hour in some locales and, in this case, is duplicated as the 'a' field. * mean using 12-hour in some locales and, in this case, is duplicated as the 'a' field.
*/ */
@ChangeId @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; static final long DISALLOW_DUPLICATE_FIELD_IN_SKELETON = 170233598L;
/** /**