Merge "Support Library v23.2.0 API Diff BUG=26448279" into mnc-docs
diff --git a/core/java/android/text/format/Time.java b/core/java/android/text/format/Time.java
index d567d90..c964ef4 100644
--- a/core/java/android/text/format/Time.java
+++ b/core/java/android/text/format/Time.java
@@ -331,7 +331,7 @@
* @throws IllegalArgumentException if {@link #allDay} is true but {@code
* hour}, {@code minute}, and {@code second} are not 0.
* @return a negative result if {@code a} is earlier, a positive result if
- * {@code a} is earlier, or 0 if they are equal.
+ * {@code b} is earlier, or 0 if they are equal.
*/
public static int compare(Time a, Time b) {
if (a == null) {
diff --git a/docs/html/auto/index.jd b/docs/html/auto/index.jd
index cc5ed2e..081a158 100644
--- a/docs/html/auto/index.jd
+++ b/docs/html/auto/index.jd
@@ -4,6 +4,7 @@
no_footer_links=true
page.type=about
page.image=/images/cards/android-auto_2x.png
+nonavpage=true
@jd:body
diff --git a/docs/html/design/index.jd b/docs/html/design/index.jd
index 5ea1244..b4e909f 100644
--- a/docs/html/design/index.jd
+++ b/docs/html/design/index.jd
@@ -5,6 +5,7 @@
page.metaDescription=Create beautiful experiences in your apps.
header.hide=1
footer.hide=1
+nonavpage=true
@jd:body
<section class="dac-expand dac-hero dac-light">
diff --git a/docs/html/index.jd b/docs/html/index.jd
index df81589..1777e72 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -2,6 +2,7 @@
excludeFromSuggestions=true
page.metaDescription=The official site for Android developers. Provides the Android SDK and documentation for app developers and designers.
page.customHeadTag=<meta name="google-site-verification" content="sa-bIAI6GKvct3f61-WpRguHq-aNjtF7xJjMTSi79as" />
+nonavpage=true
@jd:body
diff --git a/docs/html/tv/adt-1/index.jd b/docs/html/tv/adt-1/index.jd
index 4f62796..0b6cc235 100644
--- a/docs/html/tv/adt-1/index.jd
+++ b/docs/html/tv/adt-1/index.jd
@@ -1,6 +1,7 @@
page.title=ADT-1 Developer Kit
page.tags="emote","e-mote","adt"
fullpage=1
+nonavpage=true
@jd:body
diff --git a/docs/html/tv/adt-1/regulatory.jd b/docs/html/tv/adt-1/regulatory.jd
index f92ce3e..bd97df2 100644
--- a/docs/html/tv/adt-1/regulatory.jd
+++ b/docs/html/tv/adt-1/regulatory.jd
@@ -1,5 +1,6 @@
page.title=Regulatory Disclosures for ADT-1
fullpage=1
+nonavpage=true
@jd:body
diff --git a/docs/html/tv/adt-1/safety.jd b/docs/html/tv/adt-1/safety.jd
index 79a9736..211220f 100644
--- a/docs/html/tv/adt-1/safety.jd
+++ b/docs/html/tv/adt-1/safety.jd
@@ -1,5 +1,6 @@
page.title=Important Safety Instructions for ADT-1
fullpage=1
+nonavpage=true
@jd:body
diff --git a/docs/html/tv/index.jd b/docs/html/tv/index.jd
index 53948ff..7c958c0 100644
--- a/docs/html/tv/index.jd
+++ b/docs/html/tv/index.jd
@@ -7,6 +7,7 @@
fullpage=true
no_footer_links=true
page.type=about
+nonavpage=true
@jd:body
diff --git a/docs/html/wear/index.jd b/docs/html/wear/index.jd
index 618fb30..62c0253 100644
--- a/docs/html/wear/index.jd
+++ b/docs/html/wear/index.jd
@@ -4,6 +4,7 @@
no_footer_links=true
page.type=about
page.image=images/cards/android-wear_2x.png
+nonavpage=true
@jd:body
<style>