aboutsummaryrefslogtreecommitdiff
path: root/en
diff options
context:
space:
mode:
authorAndroid Partner Docs <noreply@android.com>2018-03-19 18:41:32 -0700
committerClay Murphy <claym@google.com>2018-03-20 10:07:01 -0700
commit44d80a9d5817285ee9cfc63a2eaf78f4208a7f2e (patch)
tree3f30b9d10c3d5e6b0e923933078ffb144effe610 /en
parent701b7fac720fcf01ad083ec7e9a41ee35f7cada1 (diff)
downloadsource.android.com-44d80a9d5817285ee9cfc63a2eaf78f4208a7f2e.tar.gz
Docs: Changes to source.android.com
- 189676745 Add missing arrows in treble_vndk_design.png. by Android Partner Docs <noreply@android.com> - 189627338 Change Google Inc. to Google LLC by Danielle Roberts <daroberts@google.com> - 189618579 Add "updated" to date at top of file by Danielle Roberts <daroberts@google.com> - 189605698 Devsite localized content from translation request 288cfb... by Android Partner Docs <noreply@android.com> - 189605686 Devsite localized content from translation request 9e3d8a... by Android Partner Docs <noreply@android.com> - 189604258 Point the "Year in Review" link to the latest available r... by Android Partner Docs <noreply@android.com> PiperOrigin-RevId: 189676745 Change-Id: Ic37dbdbbe95d25942748ea96ae28583b060b98e2
Diffstat (limited to 'en')
-rw-r--r--en/compatibility/source/android-cdd-cover.html2
-rw-r--r--en/devices/architecture/images/treble_vndk_design.pngbin28465 -> 34590 bytes
-rw-r--r--en/legal.html4
-rw-r--r--en/security/bulletin/2018-02-01.html2
-rw-r--r--en/security/index.html2
-rw-r--r--en/setup/brands.html4
6 files changed, 7 insertions, 7 deletions
diff --git a/en/compatibility/source/android-cdd-cover.html b/en/compatibility/source/android-cdd-cover.html
index fbc7256f..7fd2aa3f 100644
--- a/en/compatibility/source/android-cdd-cover.html
+++ b/en/compatibility/source/android-cdd-cover.html
@@ -26,7 +26,7 @@ style="border-top: 5px solid orange; border-bottom: 5px solid orange"/>
<td>
<p class="subtitle">Android 8.0</p>
<p class="cover-text">Last updated: September 1, 2017</p>
-<p class="cover-text">Copyright &copy; 2017, Google Inc. All rights reserved.</p>
+<p class="cover-text">Copyright &copy; 2018, Google LLC All rights reserved.</p>
<p class="cover-text"><a href="mailto:compatibility@android.com">compatibility@android.com</a></p>
</td>
</tr>
diff --git a/en/devices/architecture/images/treble_vndk_design.png b/en/devices/architecture/images/treble_vndk_design.png
index f41bded8..205a97ed 100644
--- a/en/devices/architecture/images/treble_vndk_design.png
+++ b/en/devices/architecture/images/treble_vndk_design.png
Binary files differ
diff --git a/en/legal.html b/en/legal.html
index 733675e4..181d4bf7 100644
--- a/en/legal.html
+++ b/en/legal.html
@@ -27,7 +27,7 @@
<div class="landing-banner">
- <p>Android is developed by Google Inc. and the <a
+ <p>Android is developed by Google LLC and the <a
href="http://www.openhandsetalliance.com/">Open Handset Alliance</a>. We've made it available to you
as a development platform pursuant to our commitment to openness, freedom, and innovation in
mobile.</p>
@@ -38,7 +38,7 @@
<p>The "Android" name, the <img src="/setup/assets/images/sac_logo.png" alt="Android"
style="margin:0;padding:0 2px;vertical-align:baseline" /> logo, and
-<a href="http://www.google.com/permissions/">other trademarks</a> are property of Google Inc.</p>
+<a href="http://www.google.com/permissions/">other trademarks</a> are property of Google LLC.</p>
<p>See the <a href="/setup/brands.html">Brand Guidelines</a> for additional details.</p>
diff --git a/en/security/bulletin/2018-02-01.html b/en/security/bulletin/2018-02-01.html
index 878f2beb..972ff4d2 100644
--- a/en/security/bulletin/2018-02-01.html
+++ b/en/security/bulletin/2018-02-01.html
@@ -20,7 +20,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
- <p><em>Published February 5, 2018 | February 14, 2018</em></p>
+ <p><em>Published February 5, 2018 | Updated February 14, 2018</em></p>
<p>
diff --git a/en/security/index.html b/en/security/index.html
index ca4e45e3..24d4b54a 100644
--- a/en/security/index.html
+++ b/en/security/index.html
@@ -158,7 +158,7 @@ Android devices with <a href="https://www.android.com/gms/">Google Mobile
Services</a>. While these services are not part of the Android Open Source
Project, they are included on many Android devices. For more information on
some of these services, see Android Security’s
-<a href="/security/reports/Google_Android_Security_2016_Report_Final.pdf">2016
+<a href="/security/reports/Google_Android_Security_2017_Report_Final.pdf">2017
Year in Review</a>.
</p>
<p>
diff --git a/en/setup/brands.html b/en/setup/brands.html
index 17927169..ca08b8dd 100644
--- a/en/setup/brands.html
+++ b/en/setup/brands.html
@@ -25,7 +25,7 @@
<p>The "Android" name, the <img src="/setup/assets/images/sac_logo.png"
alt="Android" style="margin:0;padding:0 2px;vertical-align:baseline" /> logo,
-the "Google Play" brand, and other trademarks are property of Google Inc. and
+the "Google Play" brand, and other trademarks are property of Google LLC and
not part of the assets available through the Android Open Source Project.</p>
<p>If you are interested in using these brands to indicate their association
@@ -74,7 +74,7 @@ assets.</p>
</ul>
<p><strong>Any use of the Android name must include this attribution in your
communication</strong>:</p>
- <blockquote><em>Android is a trademark of Google Inc.</em></blockquote></p>
+ <blockquote><em>Android is a trademark of Google LLC.</em></blockquote></p>
</li>
</ul>