commit 278afa73b21023856aa5b39436138abe1b1271bf
author Scott Kennedy <skennedy@google.com> Tue Jan 15 16:52:14 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 15 16:52:14 2013 -0800
tree aa66707d90b4b52993fa40a9961af071ef8db218
parent 61963e88d9af350ce46b135e3fc850e738e14830
parent 7e553e15d9f903f01e7038bd691aaa94e4524b97

am 7e553e15: am d50a0383: am ff5b7393: am 39ea055f: am 335da367: Merge "docs: Another fix for external 42607" into jb-mr1-dev

* commit '7e553e15d9f903f01e7038bd691aaa94e4524b97':
  docs: Another fix for external 42607

docs/html/guide/topics/location/strategies.jd

diff --git a/docs/html/guide/topics/location/strategies.jd b/docs/html/guide/topics/location/strategies.jd
index 404b797..6cc8f1a 100644
--- a/docs/html/guide/topics/location/strategies.jd
+++ b/docs/html/guide/topics/location/strategies.jd
@@ -204,7 +204,7 @@
 <pre>
 String locationProvider = LocationManager.NETWORK_PROVIDER;
 // Or, use GPS location data:
-// LocationProvider locationProvider = LocationManager.GPS_PROVIDER;
+// String locationProvider = LocationManager.GPS_PROVIDER;
 
 locationManager.requestLocationUpdates(locationProvider, 0, 0, locationListener);
 </pre>