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 am: de4ea8f38b am: e47e8ec3f6

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

Change-Id: Ie4bdd8bc8c8ecd9d1d6bda75326191ae158be7e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-09-16 13:31:33 +00:00
committed by Automerger Merge Worker
parent f1f8a7519c e47e8ec3f6
commit 15390ccf1d
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.
*/
@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;
/**