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

Commit 5c137a76 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Fix build"

parents 2b3329bb 2a6b7025

api/current.txt

+5 −5
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ package android { 
    field public static final int freezesText = 16843116; // 0x101016c

    field public static final int fromAlpha = 16843210; // 0x10101ca

    field public static final int fromDegrees = 16843187; // 0x10101b3

    field public static final int fromScene = 16843740; // 0x10103dc

    field public static final int fromScene = 16843741; // 0x10103dd

    field public static final int fromXDelta = 16843206; // 0x10101c6

    field public static final int fromXScale = 16843202; // 0x10101c2

    field public static final int fromYDelta = 16843208; // 0x10101c8
@@ -629,7 +629,7 @@ package android { 
    field public static final int keyboardLayout = 16843691; // 0x10103ab

    field public static final int keyboardMode = 16843341; // 0x101024d

    field public static final int keycode = 16842949; // 0x10100c5

    field public static final int keyset = 16843738; // 0x10103da

    field public static final int keyset = 16843739; // 0x10103db

    field public static final int killAfterRestore = 16843420; // 0x101029c

    field public static final int label = 16842753; // 0x1010001

    field public static final int labelFor = 16843718; // 0x10103c6
@@ -1016,7 +1016,7 @@ package android { 
    field public static final int targetActivity = 16843266; // 0x1010202

    field public static final int targetClass = 16842799; // 0x101002f

    field public static final int targetDescriptions = 16843680; // 0x10103a0

    field public static final int targetID = 16843739; // 0x10103db

    field public static final int targetID = 16843740; // 0x10103dc

    field public static final int targetPackage = 16842785; // 0x1010021

    field public static final int targetSdkVersion = 16843376; // 0x1010270

    field public static final int taskAffinity = 16842770; // 0x1010012
@@ -1105,7 +1105,7 @@ package android { 
    field public static final int titleTextStyle = 16843512; // 0x10102f8

    field public static final int toAlpha = 16843211; // 0x10101cb

    field public static final int toDegrees = 16843188; // 0x10101b4

    field public static final int toScene = 16843741; // 0x10103dd

    field public static final int toScene = 16843742; // 0x10103de

    field public static final int toXDelta = 16843207; // 0x10101c7

    field public static final int toXScale = 16843203; // 0x10101c3

    field public static final int toYDelta = 16843209; // 0x10101c9
@@ -1120,7 +1120,7 @@ package android { 
    field public static final int transcriptMode = 16843008; // 0x1010100

    field public static final int transformPivotX = 16843552; // 0x1010320

    field public static final int transformPivotY = 16843553; // 0x1010321

    field public static final int transition = 16843742; // 0x10103de

    field public static final int transition = 16843743; // 0x10103df

    field public static final int translationX = 16843554; // 0x1010322

    field public static final int translationY = 16843555; // 0x1010323

    field public static final int type = 16843169; // 0x10101a1