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

Commit b8fff382 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Fix build after merge. 

am: 93512258

* commit '93512258':
  Fix build after merge.

Change-Id: I7c92c65266e623f8b245b4dcbbd6aef85eaef74b
parents 0c26c324 93512258

api/current.txt

+9 −9
Original line number Diff line number Diff line
@@ -1039,7 +1039,7 @@ package android { 
    field public static final int rotation = 16843558; // 0x1010326

    field public static final int rotationX = 16843559; // 0x1010327

    field public static final int rotationY = 16843560; // 0x1010328

    field public static final int roundIcon = 16844083; // 0x1010533

    field public static final int roundIcon = 16844080; // 0x1010530

    field public static final int rowCount = 16843637; // 0x1010375

    field public static final int rowDelay = 16843216; // 0x10101d0

    field public static final int rowEdgeFlags = 16843329; // 0x1010241
@@ -1107,14 +1107,14 @@ package android { 
    field public static final int shareInterpolator = 16843195; // 0x10101bb

    field public static final int sharedUserId = 16842763; // 0x101000b

    field public static final int sharedUserLabel = 16843361; // 0x1010261

    field public static final int shortcutCategories = 16844080; // 0x1010530

    field public static final int shortcutDisabledMessage = 16844079; // 0x101052f

    field public static final int shortcutIcon = 16844076; // 0x101052c

    field public static final int shortcutId = 16844075; // 0x101052b

    field public static final int shortcutIntentAction = 16844081; // 0x1010531

    field public static final int shortcutIntentData = 16844082; // 0x1010532

    field public static final int shortcutLongLabel = 16844078; // 0x101052e

    field public static final int shortcutShortLabel = 16844077; // 0x101052d

    field public static final int shortcutCategories = 16844077; // 0x101052d

    field public static final int shortcutDisabledMessage = 16844076; // 0x101052c

    field public static final int shortcutIcon = 16844073; // 0x1010529

    field public static final int shortcutId = 16844072; // 0x1010528

    field public static final int shortcutIntentAction = 16844078; // 0x101052e

    field public static final int shortcutIntentData = 16844079; // 0x101052f

    field public static final int shortcutLongLabel = 16844075; // 0x101052b

    field public static final int shortcutShortLabel = 16844074; // 0x101052a

    field public static final int shouldDisableView = 16843246; // 0x10101ee

    field public static final int showAsAction = 16843481; // 0x10102d9

    field public static final int showDefault = 16843258; // 0x10101fa

api/system-current.txt

+9 −9
Original line number Diff line number Diff line
@@ -1145,7 +1145,7 @@ package android { 
    field public static final int rotation = 16843558; // 0x1010326

    field public static final int rotationX = 16843559; // 0x1010327

    field public static final int rotationY = 16843560; // 0x1010328

    field public static final int roundIcon = 16844083; // 0x1010533

    field public static final int roundIcon = 16844080; // 0x1010530

    field public static final int rowCount = 16843637; // 0x1010375

    field public static final int rowDelay = 16843216; // 0x10101d0

    field public static final int rowEdgeFlags = 16843329; // 0x1010241
@@ -1217,14 +1217,14 @@ package android { 
    field public static final int shareInterpolator = 16843195; // 0x10101bb

    field public static final int sharedUserId = 16842763; // 0x101000b

    field public static final int sharedUserLabel = 16843361; // 0x1010261

    field public static final int shortcutCategories = 16844080; // 0x1010530

    field public static final int shortcutDisabledMessage = 16844079; // 0x101052f

    field public static final int shortcutIcon = 16844076; // 0x101052c

    field public static final int shortcutId = 16844075; // 0x101052b

    field public static final int shortcutIntentAction = 16844081; // 0x1010531

    field public static final int shortcutIntentData = 16844082; // 0x1010532

    field public static final int shortcutLongLabel = 16844078; // 0x101052e

    field public static final int shortcutShortLabel = 16844077; // 0x101052d

    field public static final int shortcutCategories = 16844077; // 0x101052d

    field public static final int shortcutDisabledMessage = 16844076; // 0x101052c

    field public static final int shortcutIcon = 16844073; // 0x1010529

    field public static final int shortcutId = 16844072; // 0x1010528

    field public static final int shortcutIntentAction = 16844078; // 0x101052e

    field public static final int shortcutIntentData = 16844079; // 0x101052f

    field public static final int shortcutLongLabel = 16844075; // 0x101052b

    field public static final int shortcutShortLabel = 16844074; // 0x101052a

    field public static final int shouldDisableView = 16843246; // 0x10101ee

    field public static final int showAsAction = 16843481; // 0x10102d9

    field public static final int showDefault = 16843258; // 0x10101fa

api/test-current.txt

+9 −9
Original line number Diff line number Diff line
@@ -1039,7 +1039,7 @@ package android { 
    field public static final int rotation = 16843558; // 0x1010326

    field public static final int rotationX = 16843559; // 0x1010327

    field public static final int rotationY = 16843560; // 0x1010328

    field public static final int roundIcon = 16844083; // 0x1010533

    field public static final int roundIcon = 16844080; // 0x1010530

    field public static final int rowCount = 16843637; // 0x1010375

    field public static final int rowDelay = 16843216; // 0x10101d0

    field public static final int rowEdgeFlags = 16843329; // 0x1010241
@@ -1107,14 +1107,14 @@ package android { 
    field public static final int shareInterpolator = 16843195; // 0x10101bb

    field public static final int sharedUserId = 16842763; // 0x101000b

    field public static final int sharedUserLabel = 16843361; // 0x1010261

    field public static final int shortcutCategories = 16844080; // 0x1010530

    field public static final int shortcutDisabledMessage = 16844079; // 0x101052f

    field public static final int shortcutIcon = 16844076; // 0x101052c

    field public static final int shortcutId = 16844075; // 0x101052b

    field public static final int shortcutIntentAction = 16844081; // 0x1010531

    field public static final int shortcutIntentData = 16844082; // 0x1010532

    field public static final int shortcutLongLabel = 16844078; // 0x101052e

    field public static final int shortcutShortLabel = 16844077; // 0x101052d

    field public static final int shortcutCategories = 16844077; // 0x101052d

    field public static final int shortcutDisabledMessage = 16844076; // 0x101052c

    field public static final int shortcutIcon = 16844073; // 0x1010529

    field public static final int shortcutId = 16844072; // 0x1010528

    field public static final int shortcutIntentAction = 16844078; // 0x101052e

    field public static final int shortcutIntentData = 16844079; // 0x101052f

    field public static final int shortcutLongLabel = 16844075; // 0x101052b

    field public static final int shortcutShortLabel = 16844074; // 0x101052a

    field public static final int shouldDisableView = 16843246; // 0x10101ee

    field public static final int showAsAction = 16843481; // 0x10102d9

    field public static final int showDefault = 16843258; // 0x10101fa