summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-11-11 11:48:27 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-11 11:48:27 -0800
commit9a176507a96ceb3640a56a5449e96fc3e406a765 (patch)
tree1ceed497531cee93e83e1ebce22575f37284f530 /media
parent8a0654231ff36d938bc3451190cf67231195f1d0 (diff)
parentb7a000a6fb84ae75847e730332bae62ba1234999 (diff)
downloadframeworks_base-9a176507a96ceb3640a56a5449e96fc3e406a765.zip
frameworks_base-9a176507a96ceb3640a56a5449e96fc3e406a765.tar.gz
frameworks_base-9a176507a96ceb3640a56a5449e96fc3e406a765.tar.bz2
am b7a000a6: Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1
* commit 'b7a000a6fb84ae75847e730332bae62ba1234999': 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...