tree 8199a5f834701fa8cc57108876f74e7f102f8b62
parent 921ec6f5542b7f1a459458b7426cb62521f2c8ce
parent 34161132030254bac7dd64c9713832e2f961a061
author Eric Laurent <elaurent@google.com> 1279731137 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279731137 -0700

am 34161132: am 7070b365: Added support for auxiliary audio effects to AudioTrack and MediaPlayer.

Merge commit '34161132030254bac7dd64c9713832e2f961a061'

* commit '34161132030254bac7dd64c9713832e2f961a061':
  Added support for auxiliary audio effects to AudioTrack and MediaPlayer.