Merge "DO NOT MERGE suggest LocationRequest rather than Criteria" into jb-mr1-dev

Victoria Lease · Android (Google) Code Review · commit ac14efce4b95 · 2012-10-30T13:26:38.000-07:00
diff --git a/location/java/android/location/LocationProvider.java b/location/java/android/location/LocationProvider.java
@@ -33,8 +33,8 @@
  * Criteria} class allows providers to be selected based on
  * user-specified criteria.
  *
- * @deprecated Use the {@link Criteria} class to request location instead of
- * enumerating providers.
+ * @deprecated Use the {@link LocationRequest} class to request location
+ * instead of enumerating providers.
  */
 @Deprecated
 public class LocationProvider {
