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

Commit 29f28cfe authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am e899caf8: Fixed api/current.xml after a bad merge. 

Merge commit 'e899caf8' into gingerbread-plus-aosp

* commit 'e899caf8':
  Fixed api/current.xml after a bad merge.
parents 42bb545a e899caf8

api/current.xml

+2 −2
Original line number Diff line number Diff line
@@ -176769,7 +176769,7 @@ 
 synchronized="false"

 static="true"

 final="false"

 deprecated="deprecated"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="downTime" type="long">
@@ -176804,7 +176804,7 @@ 
 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="downTime" type="long">