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

Merge commit '27c7fb1a861776b4fdc2632697e4e25eee83617f'

* commit '27c7fb1a861776b4fdc2632697e4e25eee83617f':
  Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
tree: e7fe850b1e78f29434d2f0226830b3d763ebc5f7
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/