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

Commit 3ee7ce2b authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "Fixing the build for real."

parents b3ef538f 4b3cdbb2

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ package android { 
    field public static final int ems = 16843096; // 0x1010158

    field public static final deprecated int enabled = 16842766; // 0x101000e

    field public static final int endColor = 16843166; // 0x101019e

    field public static final int endYear = 16843133; // 0x101017d

    field public static final deprecated int endYear = 16843133; // 0x101017d

    field public static final int enterFadeDuration = 16843532; // 0x101030c

    field public static final int entries = 16842930; // 0x10100b2

    field public static final int entryValues = 16843256; // 0x10101f8
@@ -888,7 +888,7 @@ package android { 
    field public static final int starStyle = 16842882; // 0x1010082

    field public static final int startColor = 16843165; // 0x101019d

    field public static final int startOffset = 16843198; // 0x10101be

    field public static final int startYear = 16843132; // 0x101017c

    field public static final deprecated int startYear = 16843132; // 0x101017c

    field public static final int stateNotNeeded = 16842774; // 0x1010016

    field public static final int state_above_anchor = 16842922; // 0x10100aa

    field public static final int state_accelerated = 16843547; // 0x101031b

core/res/res/values/public.xml

+2 −2
Original line number Diff line number Diff line
@@ -1955,9 +1955,9 @@ 
  <public type="attr" name="flipInterval" id="0x01010179" />

  <public type="attr" name="fillViewport" id="0x0101017a" />

  <public type="attr" name="prompt" id="0x0101017b" />

  <!-- {@deprecated Use maxDate instead.} -->

  <public type="attr" name="startYear" id="0x0101017c" />

  <!-- {@deprecated Use minDate instead.} -->

  <public type="attr" name="startYear" id="0x0101017c" />

  <!-- {@deprecated Use maxDate instead.} -->

  <public type="attr" name="endYear" id="0x0101017d" />

  <public type="attr" name="mode" id="0x0101017e" />

  <public type="attr" name="layout_x" id="0x0101017f" />