From 6dc5d68399377eb8d6a3132c2af475d92ed8aca5 Mon Sep 17 00:00:00 2001
From: Joe Fernandez <joefernandez@google.com>
Date: Fri, 17 Oct 2014 13:57:15 -0700
Subject: [PATCH] docs: Android L release fixes

- L Highlights fixes
b/18029526
- L API Overview fixes
b/18034482

Change-Id: I2e93ece18748c15a8fe10749e75008bf5ed9a7c0
---
 docs/html/about/versions/android-5.0.jd | 7 ++-----
 docs/html/about/versions/lollipop.jd    | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/docs/html/about/versions/android-5.0.jd b/docs/html/about/versions/android-5.0.jd
index 4f9066cfb7b74..874262cd4f54b 100644
--- a/docs/html/about/versions/android-5.0.jd
+++ b/docs/html/about/versions/android-5.0.jd
@@ -426,12 +426,9 @@ the persistence behavior, use the
 <a href="{@docRoot}reference/android/R.attr.html#persistableMode">android:persistableMode</a>
 attribute. You can also change
 the visual properties of an activity in the recents screen, such as the
-activity’s color, label, and icon. To do this, make sure the
-<a href="{@docRoot}reference/android/R.attr.html#relinquishTaskIdentity">android:relinquishTaskIdentity</a>
-attribute of the task’s root activity is set
-to {@code true}. You can then use the
+activity’s color, label, and icon, by calling the
 {@link android.app.Activity#setTaskDescription(android.app.ActivityManager.TaskDescription) setTaskDescription()}
-method to set its appearance properties.</p>
+method.</p>
 
 <h3 id="WebView">WebView updates</h3>
 <p>Android 5.0 updates the {@link android.webkit.WebView}
diff --git a/docs/html/about/versions/lollipop.jd b/docs/html/about/versions/lollipop.jd
index 757f148612ba5..59392ea0c51e4 100644
--- a/docs/html/about/versions/lollipop.jd
+++ b/docs/html/about/versions/lollipop.jd
@@ -172,7 +172,7 @@ video apps and games to display smooth synchronized content.</p>
 
 <div class="figure" style="width:350px; margin:0 0 0 60px">
 <img src="{@docRoot}images/versions/rivalknights.png" style="float:right;" width="350" height="525" />
-<p class="img-caption">Gameloft's Rival Knights uses ASTC from AEP and Compute Shaders from ES 3.1 to deliver HDR Bloom effects and provide more graphical detail.</p>
+<p class="img-caption">Gameloft's Rival Knights uses ASTC (Adaptive Scalable Texture Compression) from AEP and Compute Shaders from ES 3.1 to deliver HDR (High Dynamic Range) Bloom effects and provide more graphical detail.</p>
 </div>
 
 <p>Android 5.0 also introduces the <strong>Android Extension Pack</strong> (AEP), a set of OpenGL ES extensions that give you access to features like tessellation shaders, geometry shaders, ASTC texture compression, per-sample interpolation and shading, and other advanced rendering capabilities. With AEP you can deliver high-performance graphics across a range of GPUs.</p>