am 32b459e5: am 4461e926: Merge "docs: Restored the preview license." into lmp-dev

automerge: f1816c2

* commit 'f1816c2bc7ba64055c56805dc47036cc261921f5':
  docs: Restored the preview license.
This commit is contained in:
Andrew Solovay
2014-10-17 00:37:39 +00:00
committed by android-build-merger

View File

@@ -1,16 +1,105 @@
page.title=License Agreement <!DOCTYPE html>
@jd:body <html>
<head>
<p>
To get started with the Android SDK Preview, you must agree to the following terms and conditions. <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
As described below, please note that this is a preview version of the Android SDK, subject to change, that you use at your own risk. The Android SDK Preview is not a stable release, and may contain errors and defects that can result in serious damage to your computer systems, devices and data. <meta name="viewport" content="width=970" />
<meta name="Description" content="To get started with the Android SDK Preview, you must agree to the following terms and conditions. As described below, please note that this is a preview version of the Android SDK, subject to change, that you use at your own risk.">
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
<title>License Agreement | Android Developers</title>
<!-- STYLESHEETS -->
<link rel="stylesheet"
href="//fonts.googleapis.com/css?family=Roboto+Condensed">
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:light,regular,medium,thin,italic,mediumitalic,bold"
title="roboto">
<link href="/assets/css/default.css" rel="stylesheet" type="text/css">
<!-- JAVASCRIPT -->
<script src="//www.google.com/jsapi" type="text/javascript"></script>
<script src="/assets/js/android_3p-bundle.js" type="text/javascript"></script>
<script type="text/javascript">
var toRoot = "/";
var metaTags = [];
var devsite = false;
</script>
<script src="/assets/js/docs.js" type="text/javascript"></script>
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-5831155-1', 'android.com');
ga('create', 'UA-49880327-2', 'android.com', {'name': 'universal'}); // New tracker);
ga('send', 'pageview');
ga('universal.send', 'pageview'); // Send page view for new tracker.
</script>
</head>
<body class="gc-documentation" itemscope="" itemtype="http://schema.org/Article">
<a name="top"></a>
<div id="body-content">
<div class="fullpage">
<div id="jd-content">
<div class="jd-descr" itemprop="articleBody">
<style>
body,html, #qv {background-color:#e9e9e9}
#qv * { font-weight:bold;}
.fullpage>#footer,
#jd-content>.content-footer.wrap {
display:none;
}
.content-footer {
display: none;
}
</style>
<div style="border-bottom: 1px solid #a5c43a; position: absolute; left: 0; right: 0; top: 0;">
<div class="wrap" style="position: relative; height: 45px; padding: 0 20px;">
<a href="/index.html" style="position:absolute;top:8px">
<img src="/assets/images/dac_logo.png" srcset="/assets/images/dac_logo@2x.png 2x" width="123" height="25" alt="Android Developers home page">
</a>
</div>
</div>
<div class="landing-rest-of-page">
<div class="landing-section" style="padding:55px 10px 0">
<div class="wrap">
<div class="col-16" id="doc-col" >
<h1 itemprop="name" >L Developer Preview License Agreement</h1>
<div class="jd-descr" itemprop="articleBody">
<p>
If you are using the <a href="/preview/index.html">Android SDK
Preview</a>, you must agree to the following terms
and conditions. As described below, please note that the preview version of the
Android SDK is subject to change, and that you use it at your own risk. The
Android SDK Preview is not a stable release, and may contain errors and defects
that can result in serious damage to your computer systems, devices and data.
</p> </p>
<p> <p>
This is the Android SDK Preview License Agreement (the “License Agreement”). This is the Android SDK Preview License Agreement (the “License Agreement”).
</p> </p>
<div class="sdk-terms" style="height:auto;border:0;padding:0;width:700px">
<div class="sdk-terms" style="height:auto;border:0;padding:0;width:940px">
1. Introduction 1. Introduction
1.1 The Android SDK Preview (referred to in the License Agreement as the “Preview” and specifically including the Android system files, packaged APIs, and Preview library files, if and when they are made available) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the Preview. 1.1 The Android SDK Preview (referred to in the License Agreement as the “Preview” and specifically including the Android system files, packaged APIs, and Preview library files, if and when they are made available) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the Preview.
@@ -140,4 +229,46 @@ This is the Android SDK Preview License Agreement (the “License Agreement”).
14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. 14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
</div> </div>
</div>
</div>
</div>
</div> <!-- end landing-body-content -->
</div>
<div class="content-footer wrap" itemscope=""
itemtype="http://schema.org/SiteNavigationElement">
<div class="paging-links layout-content-col col-10">
</div>
</div>
</div> <!-- end jd-content -->
<div id="footer" class="wrap" style="width:940px">
<div id="copyright">
Except as noted, this content is
licensed under <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>. For details and
restrictions, see the <a href="https://developer.android.com/license.html">Content
License</a>.
</div>
</div> <!-- end footer -->
</div><!-- end doc-content -->
</div> <!-- end body-content -->
</body>
</html>