tree 2b1d625e5856ed2ed5de26b99adc111cab3156d6
parent a1ca7c50cdab6f04c3479bdd3ebb9f5a6d3722ea
parent 29a2fa2eb0b3e734caa2d0d451f21b2c1639fec0
author Jean-Michel Trivi <jmtrivi@google.com> 1278704043 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1278704043 -0700

am bd3f8b71: am e7b790f1: Merge "Fix swap of sessionId and output in audio effect API." into gingerbread

Merge commit 'bd3f8b711643a172703537e34a0fa7c21c5b953f'

* commit 'bd3f8b711643a172703537e34a0fa7c21c5b953f':
  Fix swap of sessionId and output in audio effect API.