diff --git a/docs/html/license.jd b/docs/html/license.jd index 0f671e2dfa1d1..4f4036b412117 100644 --- a/docs/html/license.jd +++ b/docs/html/license.jd @@ -29,7 +29,9 @@ adhere to the preferred license, there may be exceptions, such as for documentation (code comments) extracted from a source code module that is licensed under GPLv2 or other license. In those cases, the license covering the source code module will apply to the documentation -extracted from it.
+extracted from it. Source code modules that are used in the generation +of documentation and have licenses that require attribution can be +found in the Documentation Licences section below.Third-party components of this site such as JavaScript libraries are included in the Android Open Source Project under the licenses specified by their authors. For information about these @@ -144,4 +146,102 @@ Creative Commons legal code. written attribution in the spirit of the messages above.
+The Android public API documentation incorporates text from the following source code libraries under the ICU License:
+ + +COPYRIGHT AND PERMISSION NOTICE
+ ++Copyright (c) 1995-2015 International Business Machines Corporation and others +
++All rights reserved. +
++Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, and/or sell +copies of the Software, and to permit persons +to whom the Software is furnished to do so, provided that the above +copyright notice(s) and this permission notice appear in all copies +of the Software and that both the above copyright notice(s) and this +permission notice appear in supporting documentation. +
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL +THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, +OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER +RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE +USE OR PERFORMANCE OF THIS SOFTWARE. +
++Except as contained in this notice, the name of a copyright holder shall not be +used in advertising or otherwise to promote the sale, use or other dealings in +this Software without prior written authorization of the copyright holder. +
+The Android public API documentation incorporates text from the following source code libraries under the W3C Software and Document Notice and License:
+ + +This work is being provided by the copyright holders under the following license.
++ By obtaining and/or copying this work, you (the licensee) agree that you have read, understood, + and will comply with the following terms and conditions. +
++ Permission to copy, modify, and distribute this work, with or without modification, for any + purpose and without fee or royalty is hereby granted, provided that you include the following on + ALL copies of the work or portions thereof, including modifications: +
++ THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY + PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY + PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. +
++ COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES + ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT. +
++ The name and trademarks of copyright holders may NOT be used in advertising or publicity + pertaining to the work without specific, written prior permission. Title to copyright in this work + will at all times remain with copyright holders. +
+