From 566b54126c5132a2e8442675051becab09a31543 Mon Sep 17 00:00:00 2001
From: Quddus Chong <quddusc@google.com>
Date: Tue, 29 Sep 2015 10:14:33 -0700
Subject: [PATCH] docs: M release fixes. - Fixed M version code constant in API
 Overview. - Added 'Testing Display Performance' lesson to training TOC.

Change-Id: I4feced439f4804b037d2fc7713e2c58c003e2aee
---
 docs/html/about/versions/marshmallow/android-6.0.jd | 2 +-
 docs/html/training/training_toc.cs                  | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/html/about/versions/marshmallow/android-6.0.jd b/docs/html/about/versions/marshmallow/android-6.0.jd
index 13eb40fdd7fdb..5b2e089fc4d59 100644
--- a/docs/html/about/versions/marshmallow/android-6.0.jd
+++ b/docs/html/about/versions/marshmallow/android-6.0.jd
@@ -50,7 +50,7 @@ page.metaDescription=Get to know the new developer features in Android 6.0 Marsh
 </div>
 </div>
 
-<p>Android 6.0 (<a href="{@docRoot}reference/android/os/Build.VERSION_CODES.html#MARSHMALLOW">MARSHMALLOW</a>)
+<p>Android 6.0 (<a href="{@docRoot}reference/android/os/Build.VERSION_CODES.html#M">M</a>)
 offers new features for users and app developers. This document provides an introduction to the
 most notable APIs.</p>
 
diff --git a/docs/html/training/training_toc.cs b/docs/html/training/training_toc.cs
index 22582830e8bfe..32ecb9b1c8e49 100644
--- a/docs/html/training/training_toc.cs
+++ b/docs/html/training/training_toc.cs
@@ -2045,6 +2045,12 @@ results."
         </ul>
       </li>
     </ul>
+    <ul>
+      <li><a href="<?cs var:toroot ?>training/testing/performance.html"
+      description="How to automate UI performance testing.">
+            <span class="en">Testing Display Performance</span>
+            </a></li>
+    <ul>
   </li>
   <!-- End best Testing -->