tree 872e144dacbf5668fd8012c937f1feddb06cf0c9
parent d96a068cc7b3519a5b7d122a12025684b6f28c76
parent b37fcbfd7f9d65b90b43e0242903030c5a6517b5
author Eric Laurent <elaurent@google.com> 1286551803 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286551803 -0700

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

Merge commit 'b37fcbfd7f9d65b90b43e0242903030c5a6517b5' into gingerbread-plus-aosp

* commit 'b37fcbfd7f9d65b90b43e0242903030c5a6517b5':
  Added getter for session Id to AudioSink