summaryrefslogtreecommitdiffstats
path: root/location/java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2014-10-10 04:26:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-10 04:26:40 +0000
commit75a6e82bcc625025c5f48dc6c33d0dd469e9ca61 (patch)
treea969ed89802235c1f39494ab37a7e31c2a8143e5 /location/java
parent7c5020db4f5fc8f72179d6e34b9189e70f14eb5c (diff)
parent36ae48a850bade17d485cb49dd40a3f11f667ad4 (diff)
downloadframeworks_base-75a6e82bcc625025c5f48dc6c33d0dd469e9ca61.zip
frameworks_base-75a6e82bcc625025c5f48dc6c33d0dd469e9ca61.tar.gz
frameworks_base-75a6e82bcc625025c5f48dc6c33d0dd469e9ca61.tar.bz2
am 36ae48a8: am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev
* commit '36ae48a850bade17d485cb49dd40a3f11f667ad4': Put in real "code" (aka marketing) name.
Diffstat (limited to 'location/java')
-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.
*