summaryrefslogtreecommitdiffstats
path: root/location
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2014-10-09 00:14:54 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-09 00:14:54 +0000
commit0761b1b5ebb453a411e3289c1c972dbfddcee880 (patch)
tree89fd89ca411db94e8153296d495e28ea5609176b /location
parent985d59d7e3e676a02892b2a5e131510a993b3449 (diff)
parent89b196958fee07475765bd3c458098464ba16f2e (diff)
downloadframeworks_base-0761b1b5ebb453a411e3289c1c972dbfddcee880.zip
frameworks_base-0761b1b5ebb453a411e3289c1c972dbfddcee880.tar.gz
frameworks_base-0761b1b5ebb453a411e3289c1c972dbfddcee880.tar.bz2
am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev
* commit '89b196958fee07475765bd3c458098464ba16f2e': Put in real "code" (aka marketing) name.
Diffstat (limited to 'location')
-rw-r--r--location/java/android/location/LocationManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java
index 0445869..ed408e0 100644
--- a/location/java/android/location/LocationManager.java
+++ b/location/java/android/location/LocationManager.java
@@ -1112,7 +1112,7 @@ public class LocationManager {
* {@link #requestLocationUpdates(String, long, float, LocationListener)}.
*
* <p>
- * Before API version {@link android.os.Build.VERSION_CODES#L}, this
+ * Before API version {@link android.os.Build.VERSION_CODES#LOLLIPOP}, this
* method would throw {@link SecurityException} if the location permissions
* were not sufficient to use the specified provider.
*