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.
tree: 633d6ce67a785ba813c1f9c79917ec6c40e56fee
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/