Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 90d59d18: Merge "Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that." into gingerbread

Browse Source 
Merge commit '90d59d180bd963f00161e6bfaabfda432960cab6' into gingerbread-plus-aosp

* commit '90d59d180bd963f00161e6bfaabfda432960cab6':
  Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
This commit is contained in:
Andreas Huber
2010-10-13 15:50:27 -07:00
committed by Android Git Automerger
parent 0982d8d0d3 90d59d180b
commit 27c7fb1a86
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/libmedia/Metadata.cpp
View File

@@ -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
};