Merge "Emergency workaround to patch over ID shuffling." into sc-dev am: 14f4fe4d01

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

Change-Id: Ib589c7aff5e358a26c7e5ca1a09eb06fbcc30580
This commit is contained in:
Jeff Sharkey
2021-05-13 18:12:33 +00:00
committed by Automerger Merge Worker
2 changed files with 2 additions and 0 deletions

View File

@@ -245,6 +245,7 @@ package android {
public static final class R.attr {
ctor public R.attr();
field public static final int __removed3;
field public static final int absListViewStyle = 16842858; // 0x101006a
field public static final int accessibilityEventTypes = 16843648; // 0x1010380
field public static final int accessibilityFeedbackType = 16843650; // 0x1010382

View File

@@ -3064,6 +3064,7 @@
<public name="hotwordDetectionService" />
<public name="previewLayout" />
<public name="clipToOutline" />
<public name="__removed3" />
<public name="knownCerts" />
<public name="windowBackgroundBlurRadius"/>
<public name="windowSplashScreenBackground"/>