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

Commit 8c5578bc authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

Merge "Fix build breakage due to res-id changes" into nyc-mr1-dev

parents d01f4747 c421b314

api/current.txt

+9 −9
Original line number Diff line number Diff line
@@ -1107,15 +1107,15 @@ 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 = 16844078; // 0x101052e

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    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
@@ -1217,15 +1217,15 @@ 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 = 16844078; // 0x101052e

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    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
@@ -1107,15 +1107,15 @@ 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 = 16844078; // 0x101052e

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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