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

Commit 405951b5 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 8da20dd0: am 4f8c2f26: Fix docs build. 

Merge commit '8da20dd0'

* commit '8da20dd0':
  Fix docs build.
parents 59e61354 8da20dd0

api/current.xml

+12 −1
Original line number Original line Diff line number Diff line
@@ -4996,7 +4996,7 @@ 
 type="int"

 type="int"

 transient="false"

 transient="false"

 volatile="false"

 volatile="false"

 value="16843457"

 value="16843456"

 static="true"

 static="true"

 final="true"

 final="true"

 deprecated="not deprecated"

 deprecated="not deprecated"
@@ -6202,6 +6202,17 @@ 
 visibility="public"

 visibility="public"

>

>

</field>

</field>

<field name="kraken_resource_pad64"

 type="int"

 transient="false"

 volatile="false"

 value="16843457"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="kraken_resource_pad7"

<field name="kraken_resource_pad7"

 type="int"

 type="int"

 transient="false"

 transient="false"

core/res/res/values/public.xml

+1 −2
Original line number Original line Diff line number Diff line
@@ -1250,8 +1250,7 @@ 
  <eat-comment />

  <eat-comment />

  <public type="attr" name="logo" id="0x010102be" />

  <public type="attr" name="logo" id="0x010102be" />

  <public type="attr" name="xlargeScreens" id="0x010102bf" />

  <public type="attr" name="xlargeScreens" id="0x010102bf" />

  <public type="attr" name="cantSaveState" id="0x010102c0" />

  <public type="attr" name="immersive" id="0x010102c0" />

  <public type="attr" name="immersive" id="0x010102c1" />

  <public-padding type="attr" name="kraken_resource_pad" end="0x01010300" />

  <public-padding type="attr" name="kraken_resource_pad" end="0x01010300" />





  <public-padding type="id" name="kraken_resource_pad" end="0x01020040" />

  <public-padding type="id" name="kraken_resource_pad" end="0x01020040" />