Merge commit '90d59d180bd963f00161e6bfaabfda432960cab6' into gingerbread-plus-aosp * commit '90d59d180bd963f00161e6bfaabfda432960cab6': Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
Merge commit '90d59d180bd963f00161e6bfaabfda432960cab6' into gingerbread-plus-aosp * commit '90d59d180bd963f00161e6bfaabfda432960cab6': Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.