diff options
| author | Andreas Huber <andih@google.com> | 2010-10-13 15:46:18 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-13 15:46:18 -0700 |
| commit | 90d59d180bd963f00161e6bfaabfda432960cab6 (patch) | |
| tree | 604f0c390f3aad3159ea372b98c011c9bb77947b /media | |
| parent | 5c62ab0af9dadc3bccdad7b01c3ae17266f0b0e1 (diff) | |
| parent | 0c9b577e4de7081355a4cba2d185e69f73d66057 (diff) | |
| download | frameworks_base-90d59d180bd963f00161e6bfaabfda432960cab6.zip frameworks_base-90d59d180bd963f00161e6bfaabfda432960cab6.tar.gz frameworks_base-90d59d180bd963f00161e6bfaabfda432960cab6.tar.bz2 | |
Merge "Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that." into gingerbread
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/Metadata.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/Metadata.cpp b/media/libmedia/Metadata.cpp index 35ec6b3..aec96f1 100644 --- a/media/libmedia/Metadata.cpp +++ b/media/libmedia/Metadata.cpp @@ -32,7 +32,7 @@ namespace { // All these constants below must be kept in sync with Metadata.java. enum MetadataId { FIRST_SYSTEM_ID = 1, - LAST_SYSTEM_ID = 31, + LAST_SYSTEM_ID = 32, FIRST_CUSTOM_ID = 8192 }; |