diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-10-08 22:48:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-08 22:48:44 +0000 |
| commit | 529b78941c20c2b45312eeedbd509d0ded4f7323 (patch) | |
| tree | 1aff9a9aac271e48dec04cb986c5cadc5f4105e9 /location | |
| parent | 511925c9e143ebc6eeb0efdf433cc0519b5e5eb1 (diff) | |
| parent | 89b196958fee07475765bd3c458098464ba16f2e (diff) | |
| download | frameworks_base-529b78941c20c2b45312eeedbd509d0ded4f7323.zip frameworks_base-529b78941c20c2b45312eeedbd509d0ded4f7323.tar.gz frameworks_base-529b78941c20c2b45312eeedbd509d0ded4f7323.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.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. * |