Merge "clean up the results for 'android' in search suggestions" into jb-mr1.1-ub-dev

docs/html/about/index.jd

@@ -1,4 +1,5 @@
 page.title=Android, the world's most popular mobile platform
+excludeFromSuggestions=true
 walkthru=0
 header.hide=0
 

docs/html/about/start.jd

@@ -1,4 +1,5 @@
 page.title=Get Started
+excludeFromSuggestions=true
 walkthru=0
 
 @jd:body

docs/html/google/gcm/gcm.jd

@@ -1,4 +1,4 @@
-page.title=Google Cloud Messaging for Android
+page.title=GCM Architectural Overview
 @jd:body
 
 <div id="qv-wrapper">

docs/html/google/play-services/gcm.jd

@@ -1,4 +1,4 @@
-page.title=GCM Extensions for Android
+page.title=GCM Extensions
 page.tags="cloud","push","messaging"
 header.hide=1
 @jd:body

docs/html/guide/appendix/media-formats.jd

@@ -1,4 +1,4 @@
-page.title=Android Supported Media Formats
+page.title=Supported Media Formats
 page.tags="video","audio","mpeg","mp4","m4a","mp3","3gp","3gpp","flac","wave","wav"
 @jd:body
 

docs/html/guide/faq/commontasks.jd

@@ -1,6 +1,5 @@
 page.title=Common Tasks and How to Do Them in Android
-parent.title=FAQs, Tips, and How-to
+excludeFromSuggestions=true
-parent.link=index.html
 @jd:body
 
 <ul>

docs/html/guide/faq/framework.jd

@@ -1,6 +1,5 @@
 page.title=Android Application Framework FAQ
-parent.title=FAQs, Tips, and How-to
+excludeFromSuggestions=true
-parent.link=index.html
 @jd:body
 
 <ul>

docs/html/guide/faq/index.jd

@@ -1,4 +1,5 @@
 page.title=Android FAQs
+excludeFromSuggestions=true
 @jd:body
 
 <dl>

docs/html/guide/faq/licensingandoss.jd

@@ -1,6 +1,5 @@
 page.title=Android Open Source Licensing FAQ
-parent.title=FAQs, Tips, and How-to
+excludeFromSuggestions=true
-parent.link=index.html
 @jd:body
 
 <ul>

docs/html/guide/faq/security.jd

@@ -1,6 +1,5 @@
 page.title=Android Security FAQ
-parent.title=FAQs, Tips, and How-to
+excludeFromSuggestions=true
-parent.link=index.html
 @jd:body
 
 <ul>

docs/html/guide/faq/troubleshooting.jd

@@ -1,6 +1,5 @@
 page.title=Troubleshooting
-parent.title=FAQs, Tips, and How-to
+excludeFromSuggestions=true
-parent.link=index.html
 @jd:body
 
 

docs/html/tools/devices/emulator.jd

@@ -1,6 +1,4 @@
-page.title=Using the Android Emulator
+page.title=Using the Emulator
-parent.title=Managing Virtual Devices
-parent.link=index.html
 @jd:body
 
 <div id="qv-wrapper">

docs/html/tools/tools_toc.cs

@@ -53,7 +53,7 @@
         <ul>
           <li><a href="<?cs var:toroot ?>tools/devices/managing-avds.html"><span class="en">With AVD Manager</span></a></li>
           <li><a href="<?cs var:toroot ?>tools/devices/managing-avds-cmdline.html"><span class="en">From the Command Line</span></a></li>
-          <li><a href="<?cs var:toroot ?>tools/devices/emulator.html"><span class="en">Using the Android Emulator</span></a></li>
+          <li><a href="<?cs var:toroot ?>tools/devices/emulator.html"><span class="en">Using the Emulator</span></a></li>
         </ul>
       </li>
       <li><a href="<?cs var:toroot ?>tools/device.html"><span class="en">Using Hardware Devices</span></a></li>