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.