am 6b52911c: am 48ac68e1: Merge "Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr." into gingerbread

Merge commit '6b52911cc7ba548fd3a240ca61eba510a8581e6f'

* commit '6b52911cc7ba548fd3a240ca61eba510a8581e6f':
  Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr.
tree: 9010dcc3240ab1607e71a51b1fb9d56aade552f1
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/