am bb64e554: am 7ed7668b: Merge "Calculate audio media drift time from AudioSource" into gingerbread

Merge commit 'bb64e554d9a28fcf8eebf579e91ff71b8ffef1e3'

* commit 'bb64e554d9a28fcf8eebf579e91ff71b8ffef1e3':
  Calculate audio media drift time from AudioSource
tree: 11c2ee1eaad143fd9fe20ef1c2ab59dcc6c88404
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/