commit 8cde59da2dd8540466aff5e94e9a6e5f74df1f10
author Andreas Huber <andih@google.com> Wed Oct 13 15:50:27 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 13 15:50:27 2010 -0700
tree 633d6ce67a785ba813c1f9c79917ec6c40e56fee
parent 0b5181ddfdde400f9cac6db239cf97ced3b67e22
parent 2959a5a5b4d151e14da3abe0289c15693409eb84

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.

media/libmedia/Metadata.cpp

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