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

Merge commit 'e7b790f1f77a0950c163fc82d8833072ccf6f3c5' into gingerbread-plus-aosp

* commit 'e7b790f1f77a0950c163fc82d8833072ccf6f3c5':
  Fix swap of sessionId and output in audio effect API.
tree: c6827543787e5f293827bfd8b1ded21ce8756057
  1. camera/
  2. cmds/
  3. include/
  4. media/