summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-11-11 11:51:19 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-11 11:51:19 -0800
commitc512fd065c2bb4f5d39bb13f45d3fb32370f6880 (patch)
treea7d1c97fc91c7f4ed8c06ffb49608697c9482964 /media
parent3dc44d9afe72fc1975dcf7d8b883fc101047b2be (diff)
parent9a176507a96ceb3640a56a5449e96fc3e406a765 (diff)
downloadframeworks_base-c512fd065c2bb4f5d39bb13f45d3fb32370f6880.zip
frameworks_base-c512fd065c2bb4f5d39bb13f45d3fb32370f6880.tar.gz
frameworks_base-c512fd065c2bb4f5d39bb13f45d3fb32370f6880.tar.bz2
am 9a176507: am b7a000a6: Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1
* commit '9a176507a96ceb3640a56a5449e96fc3e406a765': Unhide the key to retriever location information in 3gp/mp4 files
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/MediaMetadataRetriever.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/media/java/android/media/MediaMetadataRetriever.java b/media/java/android/media/MediaMetadataRetriever.java
index b17f297..11ecd1f 100644
--- a/media/java/android/media/MediaMetadataRetriever.java
+++ b/media/java/android/media/MediaMetadataRetriever.java
@@ -463,7 +463,6 @@ public class MediaMetadataRetriever
* The location should be specified according to ISO-6709 standard, under
* a mp4/3gp box "@xyz". Location with longitude of -90 degrees and latitude
* of 180 degrees will be retrieved as "-90.0000+180.0000", for instance.
- * @hide
*/
public static final int METADATA_KEY_LOCATION = 23;
// Add more here...