Merge "docs: Updated Android SDK Terms. bug: 24584030" into mnc-docs
diff --git a/docs/html/images/training/auto-desktop-head-unit-context-menu-enabled.png b/docs/html/images/training/auto-desktop-head-unit-context-menu-enabled.png
index 99e60e9..06361af 100644
--- a/docs/html/images/training/auto-desktop-head-unit-context-menu-enabled.png
+++ b/docs/html/images/training/auto-desktop-head-unit-context-menu-enabled.png
Binary files differ
diff --git a/docs/html/images/training/auto-desktop-head-unit-server-running.png b/docs/html/images/training/auto-desktop-head-unit-server-running.png
index 5aa3b83..f8e1f38 100644
--- a/docs/html/images/training/auto-desktop-head-unit-server-running.png
+++ b/docs/html/images/training/auto-desktop-head-unit-server-running.png
Binary files differ
diff --git a/docs/html/sdk/installing/studio-tips.jd b/docs/html/sdk/installing/studio-tips.jd
index b8511a4..6c944ab 100644
--- a/docs/html/sdk/installing/studio-tips.jd
+++ b/docs/html/sdk/installing/studio-tips.jd
@@ -204,7 +204,7 @@
 <p>With language injection, the Android Studio IDE allows you to work with islands of different
 languages embedded in the source code. This extends the syntax, error highlighting and coding
 assistance to the embedded language. This can be especially useful for checking regular expression
-values inline, and validating XML and SQL statements.</p>
+values inline and validating XML.</p>
 
 
 <h3>Code folding</h3>
diff --git a/docs/html/tools/help/theme-editor.jd b/docs/html/tools/help/theme-editor.jd
index 653f303..19f765f 100644
--- a/docs/html/tools/help/theme-editor.jd
+++ b/docs/html/tools/help/theme-editor.jd
@@ -104,9 +104,9 @@
 follow these steps:
 </p>
 <ol>
-<li>Click anywhere in the field containing the resource. The <em>Resources</em> dialog
-appears, containing a color picker, material-color palette, and other settings and
-information.</li>
+<li>Click the colored square next to the name of the resource you want to change.
+The <em>Resources</em> dialog appears, containing a color picker, material-color
+palette, and other settings and information.</li>
 <li>Change the color, opacity, and name of a theme's resources as desired.</p>
 <li>To ensure that your theme uses a color from the material
 palette, click <strong>CLOSEST MATERIAL COLOR</strong>, located next to <em>Custom
diff --git a/docs/html/training/auto/start/index.jd b/docs/html/training/auto/start/index.jd
index b9996ca..0206a24 100644
--- a/docs/html/training/auto/start/index.jd
+++ b/docs/html/training/auto/start/index.jd
@@ -220,7 +220,7 @@
 
 <ol>
   <li>On the mobile device, enable Android Auto developer mode by starting the Android Auto
-    companion app, and then tapping the header image 10 times.
+    companion app, and then tapping the <i>Android Auto</i> toolbar title 10 times.
     This step is only required the first time you run the companion app.
   </li>
   <li>If the server is not already running, select <strong>Start head unit server</strong>