diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-10-09 13:03:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-09 13:03:21 +0000 |
| commit | d83e9e42805e340384f30199777fbc472c5c6f20 (patch) | |
| tree | 0595834055c44488261afe988e065c67c5c45837 /location | |
| parent | 0a61c7ee4a94326b7524d58f456973b68ac62d35 (diff) | |
| parent | 0761b1b5ebb453a411e3289c1c972dbfddcee880 (diff) | |
| download | frameworks_base-d83e9e42805e340384f30199777fbc472c5c6f20.zip frameworks_base-d83e9e42805e340384f30199777fbc472c5c6f20.tar.gz frameworks_base-d83e9e42805e340384f30199777fbc472c5c6f20.tar.bz2 | |
am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev
* commit '0761b1b5ebb453a411e3289c1c972dbfddcee880':
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. * |