am e14923b0: am 4edf85ab: Merge "Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder." into gingerbread

Merge commit 'e14923b0c80b2e73e69b7917c1f170b356592d29'

* commit 'e14923b0c80b2e73e69b7917c1f170b356592d29':
  Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder.
tree: 0a338cada6f6d601f8bcbbf17209b98989f19ac3
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/