diff options
| author | Elliott Hughes <enh@google.com> | 2014-09-08 13:08:43 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-09-08 13:08:43 -0700 |
| commit | 4656e69bf36d42a35c9290ab79eeb33b4cca1d5c (patch) | |
| tree | 84c6fe3c5e58781c54ce34961d9152d370919dae /location | |
| parent | 8268ad6779c38fb67ea3783fd57bf71bb0cccc51 (diff) | |
| parent | 2008cff73bbc816f867dac0cd057899bed714356 (diff) | |
| download | frameworks_base-4656e69bf36d42a35c9290ab79eeb33b4cca1d5c.zip frameworks_base-4656e69bf36d42a35c9290ab79eeb33b4cca1d5c.tar.gz frameworks_base-4656e69bf36d42a35c9290ab79eeb33b4cca1d5c.tar.bz2 | |
resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp
Change-Id: I5148eda624e8504f12dbc1288cd4a7a5b7c10850
Diffstat (limited to 'location')
| -rw-r--r-- | location/java/android/location/LocationRequest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/location/java/android/location/LocationRequest.java b/location/java/android/location/LocationRequest.java index 271f2bb..39fe4ea 100644 --- a/location/java/android/location/LocationRequest.java +++ b/location/java/android/location/LocationRequest.java @@ -292,7 +292,7 @@ public final class LocationRequest implements Parcelable { * no location sources are available), or you may receive them * slower than requested. You may also receive them faster than * requested (if other applications are requesting location at a - * faster interval). The fastest rate that that you will receive + * faster interval). The fastest rate that you will receive * updates can be controlled with {@link #setFastestInterval}. * * <p>Applications with only the coarse location permission may have their |