diff options
| author | Andreas Huber <andih@google.com> | 2010-10-15 08:33:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-15 08:33:23 -0700 |
| commit | 3e8742fa4a5f0f8b185274763f6ec4e6c3a89344 (patch) | |
| tree | e7fe850b1e78f29434d2f0226830b3d763ebc5f7 /media/libmedia | |
| parent | 6fed68ded4ab2c042b7ca14409a24aee916313d5 (diff) | |
| parent | 8cde59da2dd8540466aff5e94e9a6e5f74df1f10 (diff) | |
| download | frameworks_av-3e8742fa4a5f0f8b185274763f6ec4e6c3a89344.zip frameworks_av-3e8742fa4a5f0f8b185274763f6ec4e6c3a89344.tar.gz frameworks_av-3e8742fa4a5f0f8b185274763f6ec4e6c3a89344.tar.bz2 | |
am 27c7fb1a: am 90d59d18: Merge "Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that." into gingerbread
Merge commit '27c7fb1a861776b4fdc2632697e4e25eee83617f'
* commit '27c7fb1a861776b4fdc2632697e4e25eee83617f':
Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
Diffstat (limited to 'media/libmedia')
| -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 }; |