am 2c7e5631: am 7862ba29: am 6c8b80ac: Merge "Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built." into lmp-docs

* commit '2c7e563181405ae6a91edb57f654f884b8759c8e':
  Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built.
diff --git a/docs/html/training/location/index.jd b/docs/html/training/location/index.jd
index 059a1e9..35e177f 100644
--- a/docs/html/training/location/index.jd
+++ b/docs/html/training/location/index.jd
@@ -50,9 +50,8 @@
 
 <p>
   This class shows you how to use the Google Play services location APIs in your
-  app to get the current location, get periodic location updates, look up
-  addresses, create and monitor geofences, and detect user activities. The class
-  includes sample apps and code snippets that you can use as a starting point
+  app to get the current location, get periodic location updates, and look up
+  addresses. The class includes sample apps and code snippets that you can use as a starting point
   for adding location awareness to your app.
 </p>
 
@@ -81,25 +80,5 @@
   </dt> <dd>
     Learn how to convert a location's latitude and longitude into an address
     (reverse geocoding).
-  </dd> <dt>
-    <b>
-      <a href="geofencing.html">Creating and Monitoring Geofences</a>
-    </b>
-  </dt> <dd>
-    Learn how to define one or more geographic areas as locations of interest,
-    called geofences, and detect when the user is close to or inside a geofence.
-  </dd> <dt>
-    <b><a href="activity-recognition.html">Recognizing the User's Current
-    Activity</a></b>
-  </dt> <dd>
-    Learn how to recognize the user's current activity, such as walking,
-    bicycling, or driving a car, and how to use this information to modify your
-    app's location strategy.
-  </dd> <dt>
-    <b><a href="location-testing.html">Testing Using Mock Locations</a></b>
-  </dt> <dd>
-    Learn how to test a location-aware app by injecting mock locations into
-    Location Services. In mock mode, Location Services sends out mock locations
-    that you inject instead of sensor-based locations.
   </dd>
 </dl>
diff --git a/docs/html/training/training_toc.cs b/docs/html/training/training_toc.cs
index 082f5ff..0fcfb9c 100644
--- a/docs/html/training/training_toc.cs
+++ b/docs/html/training/training_toc.cs
@@ -707,18 +707,6 @@
             Displaying a Location Address
           </a>
           </li>
-          <li><a href="<?cs var:toroot ?>training/location/geofencing.html">
-            Creating and Monitoring Geofences
-          </a>
-          </li>
-          <li><a href="<?cs var:toroot ?>training/location/activity-recognition.html">
-          Recognizing the User's Current Activity
-          </a>
-          </li>
-          <li><a href="<?cs var:toroot ?>training/location/location-testing.html">
-          Testing Using Mock Locations
-          </a>
-          </li>
         </ul>
       </li>
     </ul>