diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2015-05-09 12:10:56 -0700 |
|---|---|---|
| committer | Dirk Dougherty <ddougherty@google.com> | 2015-05-14 20:05:13 -0700 |
| commit | de401c82f58a9465593391fede942fe6ffd22ef1 (patch) | |
| tree | 60af961b413627c3f3bd2899107843f183a18db7 /docs/html/sdk | |
| parent | a0f0b5bfd8df9e0caa6848bc479f1ed3dc492efc (diff) | |
| download | frameworks_base-de401c82f58a9465593391fede942fe6ffd22ef1.zip frameworks_base-de401c82f58a9465593391fede942fe6ffd22ef1.tar.gz frameworks_base-de401c82f58a9465593391fede942fe6ffd22ef1.tar.bz2 | |
Doc change: More changes to distribute files, Google Services page update.
Change-Id: I047ff9165c5844075561b31e42f8127d8819aeb0
Diffstat (limited to 'docs/html/sdk')
| -rw-r--r-- | docs/html/sdk/index.jd | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd index 34c04cf..5f795ce 100644 --- a/docs/html/sdk/index.jd +++ b/docs/html/sdk/index.jd @@ -129,7 +129,7 @@ This is the Android Software Development Kit License Agreement 3.2 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you. -3.3 You may not use the SDK for any purpose not expressly permitted by this License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK. +3.3 You may not use the SDK for any purpose not expressly permitted by this License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK. 3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the SDK. @@ -232,7 +232,7 @@ This is the Android Software Development Kit License Agreement 14.7 This License Agreement, and your relationship with Google under this 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 this 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. -<em>November 13, 2012</em> +<em>December 8, 2014</em> </div> |