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