tree 1985b8875b5d568bea0d80da1fbe5aef77ebef75
parent da9269af5e94e25c142c519429aa77eb40f68e58
parent 2c2ce8e53f5eb94916a5d0f40b2877cc7551870d
author Eric Laurent <elaurent@google.com> 1277256737 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277256737 -0700

am 2c2ce8e5: Merge "Added support for audio sessions in MediaPlayer and AudioTrack." into gingerbread

Merge commit '2c2ce8e53f5eb94916a5d0f40b2877cc7551870d' into gingerbread-plus-aosp

* commit '2c2ce8e53f5eb94916a5d0f40b2877cc7551870d':
  Added support for audio sessions in MediaPlayer and AudioTrack.