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

Commit 93d1c2c5 authored by shared_user android-merger-prebuild's avatar shared_user android-merger-prebuild Committed by Android Git Automerger
Browse files

am be7ca98a: reovle conflicts for cc089099 

* commit 'be7ca98a':
  update sdk template... thought this was merged already, but also re-add section for offline preview
parents 04f4e772 be7ca98a

tools/droiddoc/templates-sdk/sdkpage.cs

+16 −2
Original line number Diff line number Diff line
@@ -209,7 +209,21 @@ function onDownload(link) { 
  $("#next-steps").show();

}

</script>

  <?cs /if ?> <?cs # end if online ?>

  <?cs /else ?> <?cs # end if online ?>



    <?cs if:sdk.preview ?>

      <p>Welcome developers! We are pleased to provide you with a preview SDK for the upcoming

    Android 3.0 release, to give you a head-start on developing applications for it.

    </p>

    

      <p>See the <a

    href="<?cs var:toroot ?>sdk/preview/start.html">Getting Started</a> document for more information

    about how to set up the preview SDK and get started.</p>

    <style type="text/css">

    .non-preview { display:none; }

    </style>

    <?cs /if ?>

  <?cs /if ?> <?cs end if/else online ?>

  

<?cs /if ?> <?cs # end if/else NDK ?>