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

Merge commit '7ed7668b30e70ca8e3f0f183364433326ed29f39' into gingerbread-plus-aosp

* commit '7ed7668b30e70ca8e3f0f183364433326ed29f39':
  Calculate audio media drift time from AudioSource
tree: 2fd6b826529c17c24066b7f2b86b0f3f07baf0fe
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/