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

Commit 55e8a792 authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge "Implement memtagMode and nativeHeapZeroInit manifest attrs (build fix)."

parents 578ecf84 57a349f9

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -965,7 +965,7 @@ package android { 
    field public static final int measureWithLargestChild = 16843476; // 0x10102d4

    field public static final int mediaRouteButtonStyle = 16843693; // 0x10103ad

    field public static final int mediaRouteTypes = 16843694; // 0x10103ae

    field public static final int memtagMode = 16844324; // 0x1010624

    field public static final int memtagMode = 16844325; // 0x1010625

    field public static final int menuCategory = 16843230; // 0x10101de

    field public static final int mimeGroup = 16844309; // 0x1010615

    field public static final int mimeType = 16842790; // 0x1010026
@@ -989,7 +989,7 @@ package android { 
    field public static final int multiArch = 16843918; // 0x101048e

    field public static final int multiprocess = 16842771; // 0x1010013

    field public static final int name = 16842755; // 0x1010003

    field public static final int nativeHeapZeroInit = 16844325; // 0x1010625

    field public static final int nativeHeapZeroInit = 16844326; // 0x1010626

    field public static final int navigationBarColor = 16843858; // 0x1010452

    field public static final int navigationBarDividerColor = 16844141; // 0x101056d

    field public static final int navigationContentDescription = 16843969; // 0x10104c1