am 312644cd: Merge "Support for writing to MPEG2 transport stream files." into gingerbread

Merge commit '312644cdbb39522fe9cac028b15b907ce0e8e0f7' into gingerbread-plus-aosp

* commit '312644cdbb39522fe9cac028b15b907ce0e8e0f7':
  Support for writing to MPEG2 transport stream files.
tree: 4dc92f8f6371da457d7c20e59194e73cf66d3659
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/