diff options
author | Dianne Hackborn <hackbod@google.com> | 2014-10-09 13:16:40 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-09 13:16:40 +0000 |
commit | 36ae48a850bade17d485cb49dd40a3f11f667ad4 (patch) | |
tree | 4ae798660a3856c96d0db25e08f415af09d671ab /location | |
parent | d8497e45c72fbb27961d096499984906af19d35f (diff) | |
parent | d83e9e42805e340384f30199777fbc472c5c6f20 (diff) | |
download | frameworks_base-36ae48a850bade17d485cb49dd40a3f11f667ad4.zip frameworks_base-36ae48a850bade17d485cb49dd40a3f11f667ad4.tar.gz frameworks_base-36ae48a850bade17d485cb49dd40a3f11f667ad4.tar.bz2 |
am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev
* commit 'd83e9e42805e340384f30199777fbc472c5c6f20':
Put in real "code" (aka marketing) name.
Diffstat (limited to 'location')
-rw-r--r-- | location/java/android/location/LocationManager.java | 2 |
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. * |