Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27c7fb1a authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 90d59d18: Merge "Metadata.cpp and Metadata.java had drifted out of sync.... 

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

Merge commit '90d59d18' into gingerbread-plus-aosp

* commit '90d59d18':
  Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
parents 0982d8d0 90d59d18

media/libmedia/Metadata.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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

};