diff options
| author | Andreas Huber <andih@google.com> | 2010-10-13 15:50:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-13 15:50:27 -0700 |
| commit | 27c7fb1a861776b4fdc2632697e4e25eee83617f (patch) | |
| tree | 1ce08046036c91039adc88610bde453973520dd9 /media | |
| parent | 0982d8d0d3b9d685a3c159519cb0d2eb705e3027 (diff) | |
| parent | 90d59d180bd963f00161e6bfaabfda432960cab6 (diff) | |
| download | frameworks_base-27c7fb1a861776b4fdc2632697e4e25eee83617f.zip frameworks_base-27c7fb1a861776b4fdc2632697e4e25eee83617f.tar.gz frameworks_base-27c7fb1a861776b4fdc2632697e4e25eee83617f.tar.bz2 | |
am 90d59d18: Merge "Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that." into gingerbread
Merge commit '90d59d180bd963f00161e6bfaabfda432960cab6' into gingerbread-plus-aosp
* commit '90d59d180bd963f00161e6bfaabfda432960cab6':
Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
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 }; |