am 4f21e517: am b37fcbfd: Merge "Added getter for session Id to AudioSink" into gingerbread

Merge commit '4f21e517d09b9d793d20d64547df330fba705b3c'

* commit '4f21e517d09b9d793d20d64547df330fba705b3c':
  Added getter for session Id to AudioSink
tree: 94815ad41dce013a8d793d9e70d21f330573bd2b
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/