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.
tree: 158c3288b8488031ef0803bd01c6cc998bd31fb6
  1. camera/
  2. cmds/
  3. include/
  4. media/