summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2012-08-01 10:46:29 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-01 10:46:29 -0700
commit5267f52a065b61ab52374665b13ff0347ba505ad (patch)
tree834d8181cf35b133325053a1a74bc92dd0a5bb40 /api
parent7da438a349e03f5c8046dd0e593decf6c4f32d00 (diff)
parenta76115512ba566ed426b05e3c10842ae8c07a1d0 (diff)
downloadframeworks_base-5267f52a065b61ab52374665b13ff0347ba505ad.zip
frameworks_base-5267f52a065b61ab52374665b13ff0347ba505ad.tar.gz
frameworks_base-5267f52a065b61ab52374665b13ff0347ba505ad.tar.bz2
am a7611551: am b1980049: Merge "Added a key to retrieve the rotation angle in MediaMetadataRetriever.java class" into jb-mr1-dev
* commit 'a76115512ba566ed426b05e3c10842ae8c07a1d0': Added a key to retrieve the rotation angle in MediaMetadataRetriever.java class
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 92818ea..955df71 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -11341,6 +11341,7 @@ package android.media {
field public static final int METADATA_KEY_NUM_TRACKS = 10; // 0xa
field public static final int METADATA_KEY_TITLE = 7; // 0x7
field public static final int METADATA_KEY_VIDEO_HEIGHT = 19; // 0x13
+ field public static final int METADATA_KEY_VIDEO_ROTATION = 24; // 0x18
field public static final int METADATA_KEY_VIDEO_WIDTH = 18; // 0x12
field public static final int METADATA_KEY_WRITER = 11; // 0xb
field public static final int METADATA_KEY_YEAR = 8; // 0x8