summaryrefslogtreecommitdiffstats
path: root/location/java/android/location/GpsMeasurement.java
diff options
context:
space:
mode:
authordestradaa <destradaa@google.com>2014-11-07 18:37:16 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-07 18:37:16 +0000
commit0091629788e883222ad358fa70e2cdfb3d71a296 (patch)
treeae32526d120de8317cf442e516ccde18f4d802da /location/java/android/location/GpsMeasurement.java
parent37f0e4e7eae7bab2b8e04d899a0192b797f3bbe7 (diff)
parent3546c9a5821fc8a754e05593d314c49cd6bca0d0 (diff)
downloadframeworks_base-0091629788e883222ad358fa70e2cdfb3d71a296.zip
frameworks_base-0091629788e883222ad358fa70e2cdfb3d71a296.tar.gz
frameworks_base-0091629788e883222ad358fa70e2cdfb3d71a296.tar.bz2
am 3546c9a5: Merge "Mark Gps Raw related APIs as System APIs. b/16727892" into lmp-mr1-dev
* commit '3546c9a5821fc8a754e05593d314c49cd6bca0d0': Mark Gps Raw related APIs as System APIs. b/16727892
Diffstat (limited to 'location/java/android/location/GpsMeasurement.java')
-rw-r--r--location/java/android/location/GpsMeasurement.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/location/java/android/location/GpsMeasurement.java b/location/java/android/location/GpsMeasurement.java
index 1550dc2..1c50181 100644
--- a/location/java/android/location/GpsMeasurement.java
+++ b/location/java/android/location/GpsMeasurement.java
@@ -16,6 +16,7 @@
package android.location;
+import android.annotation.SystemApi;
import android.os.Parcel;
import android.os.Parcelable;
import android.util.Log;
@@ -25,6 +26,7 @@ import android.util.Log;
*
* @hide
*/
+@SystemApi
public class GpsMeasurement implements Parcelable {
private static final String TAG = "GpsMeasurement";