am 7d93b757: (-s ours) am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread

* commit '7d93b7574f741a9cd8872771faefa3c92bed6576':
  MP3Extractor and MP3 decoder fixes - DO NOT MERGE
tree: f1e74e7affc2eeacda43b218f14a1eb89f9a1fab
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/