tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

reovle conflicts for cc089099

Browse source 
Change-Id: Ia449a3a3dc13928afb5c6ab6f4dcdf6eb049372b
This commit is contained in:
shared_user android-merger-prebuild 2011-01-18 08:21:32 -08:00
commit be7ca98a86
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tools/droiddoc/templates-sdk/sdkpage.cs
View file

@ -209,8 +209,22 @@ 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 ?>
<?cs /if ?> <?cs # end if/else redirect ?>