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 /docs/html/reference/com/google/android/gms | |
| 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 'docs/html/reference/com/google/android/gms')
| -rw-r--r-- | docs/html/reference/com/google/android/gms/cast/MediaMetadata.html | 4 | ||||
| -rw-r--r-- | docs/html/reference/com/google/android/gms/location/LocationRequest.html | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/reference/com/google/android/gms/cast/MediaMetadata.html b/docs/html/reference/com/google/android/gms/cast/MediaMetadata.html index 81de8cc..140f63b 100644 --- a/docs/html/reference/com/google/android/gms/cast/MediaMetadata.html +++ b/docs/html/reference/com/google/android/gms/cast/MediaMetadata.html @@ -1037,7 +1037,7 @@ Summary: <tr class="alt-color api apilevel-" > <td class="jd-typecol">int</td> <td class="jd-linkcol"><a href="/reference/com/google/android/gms/cast/MediaMetadata.html#MEDIA_TYPE_TV_SHOW">MEDIA_TYPE_TV_SHOW</a></td> - <td class="jd-descrcol" width="100%">A media type representing an TV show.</td> + <td class="jd-descrcol" width="100%">A media type representing a TV show.</td> </tr> @@ -2696,7 +2696,7 @@ From class </div> <div class="jd-details-descr"> - <div class="jd-tagdata jd-tagdescr"><p>A media type representing an TV show. </p></div> + <div class="jd-tagdata jd-tagdescr"><p>A media type representing a TV show. </p></div> <div class="jd-tagdata"> diff --git a/docs/html/reference/com/google/android/gms/location/LocationRequest.html b/docs/html/reference/com/google/android/gms/location/LocationRequest.html index a34975a..c1a44e0 100644 --- a/docs/html/reference/com/google/android/gms/location/LocationRequest.html +++ b/docs/html/reference/com/google/android/gms/location/LocationRequest.html @@ -2480,7 +2480,7 @@ From interface <p>This interval is inexact. You may not receive updates at all (if 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 updates can be controlled with + The fastest rate that you will receive updates can be controlled with <code><a href="/reference/com/google/android/gms/location/LocationRequest.html#setFastestInterval(long)">setFastestInterval(long)</a></code>. By default this fastest rate is 6x the interval frequency. <p>Applications with only the coarse location permission may have their interval silently |