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 | a4a2a3aaef730dbab020f7ece09149b05a399000 (patch) | |
| tree | b0761447c181e0c07d3ee7f80996c24e1d4bdd2d /media | |
| parent | c182a57897fbb505b7043cdd03a7f4eb41ed67e2 (diff) | |
| parent | 27c7fb1a861776b4fdc2632697e4e25eee83617f (diff) | |
| download | frameworks_base-a4a2a3aaef730dbab020f7ece09149b05a399000.zip frameworks_base-a4a2a3aaef730dbab020f7ece09149b05a399000.tar.gz frameworks_base-a4a2a3aaef730dbab020f7ece09149b05a399000.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')
| -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 }; |